Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: I1528ae992f44b40f100e1e383f177c8e9f4b99f6
This commit is contained in:
Treehugger Robot
2020-08-26 22:20:13 +00:00
committed by Automerger Merge Worker
parent 8ba26a7080 e2769b4c4c
commit 9f1bb55f22
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
identity/support/src/IdentityCredentialSupport.cpp
View File

@@ -1536,12 +1536,6 @@ optional<vector<uint8_t>> certificateChainGetTopMostKey(const vector<uint8_t>& c
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 @@ bool ecdsaSignatureDerToCose(const vector<uint8_t>& ecdsaDerSignature,
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;
}