tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I2c63ce2a06bfd63834cccc9b7bb947f07b59666f
This commit is contained in:
Treehugger Robot 2020-08-26 21:15:21 +00:00 committed by Automerger Merge Worker
commit fdc2a99661
1 changed files with 2 additions and 8 deletions
Show stats 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;
}