Merge bitcoin#606: [Trivial] clean logs from CObfuScationSigner::VerifyMessage

Mrs-X · Mrs-X · commit 9985266821a7 · 2018-05-11T19:31:35.000+02:00
37c6e7d do not print strMessage �in CObfuScationSigner::VerifyMessage (gpdionisio) Tree-SHA512: ddc04de20c0d90c17a1f0dd620b96c2264a8688df604b23b7ebe0bbaf8cfd3c2893c3b1d8281b74583f6522ba76a2751f2070dbf2f8537518aad6a7af47776f9
diff --git a/src/obfuscation.cpp b/src/obfuscation.cpp
@@ -2175,9 +2175,8 @@ bool CObfuScationSigner::VerifyMessage(CPubKey pubkey, vector<unsigned char>& vc
     }
 
     if (pubkey2.GetID() != pubkey.GetID()) {
-        errorMessage = strprintf("keys don't match - input: %s, recovered: %s, message: %s, sig: %s\n",
-                pubkey.GetID().ToString(), pubkey2.GetID().ToString(), strMessage,
-                EncodeBase64(&vchSig[0], vchSig.size()));
+        errorMessage = strprintf("keys don't match - input: %s, recovered: %s, sig: %s\n",
+                pubkey.GetID().ToString(), pubkey2.GetID().ToString(), EncodeBase64(&vchSig[0], vchSig.size()));
         return false;
     }
 
@@ -2326,3 +2325,4 @@ void ThreadCheckObfuScationPool()
         }
     }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -2175,9 +2175,8 @@ bool CObfuScationSigner::VerifyMessage(CPubKey pubkey, vector<unsigned char>& vc`
`2175`	`2175`	`}`
`2176`	`2176`
`2177`	`2177`	`if (pubkey2.GetID() != pubkey.GetID()) {`
`2178`		`- errorMessage = strprintf("keys don't match - input: %s, recovered: %s, message: %s, sig: %s\n",`
`2179`		`- pubkey.GetID().ToString(), pubkey2.GetID().ToString(), strMessage,`
`2180`		`- EncodeBase64(&vchSig[0], vchSig.size()));`
	`2178`	`+ errorMessage = strprintf("keys don't match - input: %s, recovered: %s, sig: %s\n",`
	`2179`	`+ pubkey.GetID().ToString(), pubkey2.GetID().ToString(), EncodeBase64(&vchSig[0], vchSig.size()));`
`2181`	`2180`	`return false;`
`2182`	`2181`	`}`
`2183`	`2182`
`@@ -2326,3 +2325,4 @@ void ThreadCheckObfuScationPool()`
`2326`	`2325`	`}`
`2327`	`2326`	`}`
`2328`	`2327`	`}`
	`2328`	`+`