wolfcrypt/src/asn.c: fix merge conflict between 648f474 and 2c96090, re -Wconversion in DecodeAuthKeyId().

douzzer · douzzer · commit e2833f99a3a4 · 2023-07-14T09:53:54.000-05:00
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
@@ -18873,7 +18873,7 @@ static int DecodeAuthKeyId(const byte* input, word32 sz, DecodedCert* cert)
         /* Get the hash or hash of the hash if wrong size. */
         ret = GetHashId(dataASN[AUTHKEYIDASN_IDX_KEYID].data.ref.data,
                     (int)dataASN[AUTHKEYIDASN_IDX_KEYID].data.ref.length,
-                    cert->extAuthKeyId, HashIdAlg((int)cert->signatureOID));
+                    cert->extAuthKeyId, HashIdAlg(cert->signatureOID));
     }
 #ifdef WOLFSSL_AKID_NAME
     if (ret == 0 && dataASN[AUTHKEYIDASN_IDX_ISSUER].data.ref.data != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -18873,7 +18873,7 @@ static int DecodeAuthKeyId(const byte* input, word32 sz, DecodedCert* cert)`
`18873`	`18873`	`/* Get the hash or hash of the hash if wrong size. */`
`18874`	`18874`	`ret = GetHashId(dataASN[AUTHKEYIDASN_IDX_KEYID].data.ref.data,`
`18875`	`18875`	`(int)dataASN[AUTHKEYIDASN_IDX_KEYID].data.ref.length,`
`18876`		`- cert->extAuthKeyId, HashIdAlg((int)cert->signatureOID));`
	`18876`	`+ cert->extAuthKeyId, HashIdAlg(cert->signatureOID));`
`18877`	`18877`	`}`
`18878`	`18878`	`#ifdef WOLFSSL_AKID_NAME`
`18879`	`18879`	`if (ret == 0 && dataASN[AUTHKEYIDASN_IDX_ISSUER].data.ref.data != NULL) {`