From 317fa937b3ca5010daa59cfdb58725c7bc2b7d45 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 22 Feb 2019 00:43:44 -1100
Subject: [PATCH] parsehash

---
 src/cc/musig.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cc/musig.cpp b/src/cc/musig.cpp
index 9eaec4404..c5cf5fc4e 100644
--- a/src/cc/musig.cpp
+++ b/src/cc/musig.cpp
@@ -331,12 +331,12 @@ int32_t musig_parsepubkey(secp256k1_context *ctx,secp256k1_pubkey &spk,cJSON *it
     } else return(-1);
 }
 
-int32_t musig_parsehash32(uint8_t *hash32,cJSON *item)
+int32_t musig_parsehash(uint8_t *hash32,cJSON *item,int32_t len)
 {
     char *hexstr;
-    if ( (hexstr= jstr(item,0)) != 0 && is_hexstr(hexstr,0) == 64 )
+    if ( (hexstr= jstr(item,0)) != 0 && is_hexstr(hexstr,0) == len*2 )
     {
-        decode_hex(hash32,32,hexstr);
+        decode_hex(hash32,len,hexstr);
         return(0);
     } else return(-1);
 }
@@ -394,9 +394,9 @@ UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
         MUSIG = musig_infocreate(myind,num);
         if ( musig_parsepubkey(ctx,MUSIG->combined_pk,jitem(params,2)) < 0 )
             return(cclib_error(result,"error parsing combined_pubkey"));
-        else if ( musig_parsehash32(MUSIG->pkhash,jitem(params,3)) < 0 )
+        else if ( musig_parsehash(MUSIG->pkhash,jitem(params,3),32) < 0 )
             return(cclib_error(result,"error parsing pkhash"));
-        else if ( musig_parsehash32(MUSIG->msg,jitem(params,4)) < 0 )
+        else if ( musig_parsehash(MUSIG->msg,jitem(params,4),32) < 0 )
             return(cclib_error(result,"error parsing msg"));
         Myprivkey(privkey);
         GetRandBytes(session,32);
@@ -455,13 +455,13 @@ UniValue musig_commit(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
         ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
     if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 )
     {
-        if ( musig_parsehash32(pkhash,jitem(params,0)) < 0 )
+        if ( musig_parsehash(pkhash,jitem(params,0),32) < 0 )
             return(cclib_error(result,"error parsing pkhash"));
         else if ( memcmp(MUSIG->pkhash,pkhash,32) != 0 )
             return(cclib_error(result,"pkhash doesnt match session pkhash"));
         else if ( (ind= juint(jitem(params,1),0)) < 0 || ind >= MUSIG->num )
             return(cclib_error(result,"illegal ind for session"));
-        else if ( musig_parsehash32(&MUSIG->nonce_commitments[ind*32],jitem(params,2)) < 0 )
+        else if ( musig_parsehash(&MUSIG->nonce_commitments[ind*32],jitem(params,2),32) < 0 )
             return(cclib_error(result,"error parsing commitment"));
         /** Gets the signer's public nonce given a list of all signers' data with commitments
          *
@@ -508,7 +508,7 @@ UniValue musig_nonce(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
         ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
     if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 )
     {
-        if ( musig_parsehash32(pkhash,jitem(params,0)) < 0 )
+        if ( musig_parsehash(pkhash,jitem(params,0),32) < 0 )
             return(cclib_error(result,"error parsing pkhash"));
         else if ( memcmp(MUSIG->pkhash,pkhash,32) != 0 )
             return(cclib_error(result,"pkhash doesnt match session pkhash"));
@@ -578,13 +578,13 @@ UniValue musig_partialsig(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
         ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
     if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 )
     {
-        if ( musig_parsehash32(pkhash,jitem(params,0)) < 0 )
+        if ( musig_parsehash(pkhash,jitem(params,0),32) < 0 )
             return(cclib_error(result,"error parsing pkhash"));
         else if ( memcmp(MUSIG->pkhash,pkhash,32) != 0 )
             return(cclib_error(result,"pkhash doesnt match session pkhash"));
         else if ( (ind= juint(jitem(params,1),0)) < 0 || ind >= MUSIG->num )
             return(cclib_error(result,"illegal ind for session"));
-        else if ( musig_parsehash32(psig,jitem(params,2)) < 0 )
+        else if ( musig_parsehash(psig,jitem(params,2),32) < 0 )
             return(cclib_error(result,"error parsing psig"));
         else if ( secp256k1_musig_partial_signature_parse(ctx,&MUSIG->partial_sig[ind],psig) == 0 )
             return(cclib_error(result,"error parsing partialsig"));
@@ -625,11 +625,11 @@ UniValue musig_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
         ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY);
     if ( params != 0 && (n= cJSON_GetArraySize(params)) != 3 )
     {
-        if ( musig_parsehash32(msg,jitem(params,0)) < 0 )
+        if ( musig_parsehash(msg,jitem(params,0),32) < 0 )
             return(cclib_error(result,"error parsing pkhash"));
         else if ( musig_parsepubkey(ctx,combined_pk,jitem(params,1)) < 0 )
             return(cclib_error(result,"error parsing combined_pk"));
-        else if ( musig_parsehash64(musig64,jitem(params,2)) < 0 )
+        else if ( musig_parsehash(musig64,jitem(params,2),64) < 0 )
             return(cclib_error(result,"error parsing musig64"));
         for (i=0; i<32; i++)
             sprintf(&str[i*2],"%02x",msg[i]);