commit e2769b4c4c25a446fb8bb9132dfe4a16f93d7043
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 26 22:02:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 26 22:02:23 2020 +0000
tree 704251534bb3dd7589c716b5f4a43827cfc8e05b
parent df13a17e59b916d821fc561ea925a2b4e96b89dd
parent fdc2a996617660228ee0f3c5a744bec04f3d8b64

Merge "Avoid unnecessary access of BoringSSL structs." am: 12d0f6d9a1 am: 18aa69f6b2 am: fdc2a99661

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1412697

Change-Id: I22ea5cb5e6bbf3875c69143822dfebcc3715d0a6

identity/support/src/IdentityCredentialSupport.cpp

diff --git a/identity/support/src/IdentityCredentialSupport.cpp b/identity/support/src/IdentityCredentialSupport.cpp
index 8e099e7..747f182 100644
--- a/identity/support/src/IdentityCredentialSupport.cpp
+++ b/identity/support/src/IdentityCredentialSupport.cpp
@@ -1536,12 +1536,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";
@@ -1769,11 +1763,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;
     }