commit 12d0f6d9a16145a0ed1c346addeeb3c1c45f27b8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 26 20:48:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 26 20:48:04 2020 +0000
tree 48d947bcf129b1d62b48100bcdf6437452e10262
parent 721fecbaaf030ca641fff4bff21144f28cd078eb
parent 45ff9aa8ffc450f3f57dc25c6ff2c5c3d0657b7f

Merge "Avoid unnecessary access of BoringSSL structs."

identity/support/src/IdentityCredentialSupport.cpp

diff --git a/identity/support/src/IdentityCredentialSupport.cpp b/identity/support/src/IdentityCredentialSupport.cpp
index e9d5d6c..412f84d 100644
--- a/identity/support/src/IdentityCredentialSupport.cpp
+++ b/identity/support/src/IdentityCredentialSupport.cpp
@@ -1444,12 +1444,6 @@
         return {};
     }
 
-    int algoId = OBJ_obj2nid(certs[0]->cert_info->key->algor->algorithm);
-    if (algoId != NID_X9_62_id_ecPublicKey) {
-        LOG(ERROR) << "Expected NID_X9_62_id_ecPublicKey, got " << OBJ_nid2ln(algoId);
-        return {};
-    }
-
     auto pkey = EVP_PKEY_Ptr(X509_get_pubkey(certs[0].get()));
     if (pkey.get() == nullptr) {
         LOG(ERROR) << "No public key";
@@ -1563,11 +1557,11 @@
 
     ecdsaCoseSignature.clear();
     ecdsaCoseSignature.resize(64);
-    if (BN_bn2binpad(sig->r, ecdsaCoseSignature.data(), 32) != 32) {
+    if (BN_bn2binpad(ECDSA_SIG_get0_r(sig), ecdsaCoseSignature.data(), 32) != 32) {
         LOG(ERROR) << "Error encoding r";
         return false;
     }
-    if (BN_bn2binpad(sig->s, ecdsaCoseSignature.data() + 32, 32) != 32) {
+    if (BN_bn2binpad(ECDSA_SIG_get0_s(sig), ecdsaCoseSignature.data() + 32, 32) != 32) {
         LOG(ERROR) << "Error encoding s";
         return false;
     }