Skip to content

Removed authenticationIdentifier from cert params #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BKSSMVenkateswarlu merged 1 commit into from
Jan 21, 2021
Merged

Removed authenticationIdentifier from cert params #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions HAL/keymaster/4.1/Provision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,6 @@ static inline void getDerSubjectName(X509* x509, std::vector<uint8_t>& subject)
subject.insert(subject.begin(), subjectDer, subjectDer+len);
}

static inline void getAuthorityKeyIdentifier(X509* x509, std::vector<uint8_t>& authKeyId) {
long xlen;
int tag, xclass;

int loc = X509_get_ext_by_NID(x509, NID_authority_key_identifier, -1);
X509_EXTENSION *ext = X509_get_ext(x509, loc);
if(ext == NULL) {
LOG(ERROR) << " Failed to read authority key identifier.";
return;
}

ASN1_OCTET_STRING *asn1AuthKeyId = X509_EXTENSION_get_data(ext);
const uint8_t *strAuthKeyId = ASN1_STRING_get0_data(asn1AuthKeyId);
int strAuthKeyIdLen = ASN1_STRING_length(asn1AuthKeyId);
int ret = ASN1_get_object(&strAuthKeyId, &xlen, &tag, &xclass, strAuthKeyIdLen);
if (ret == 0x80 || strAuthKeyId == NULL) {
LOG(ERROR) << "Failed to get the auth key identifier from ASN1 sequence.";
return;
}
authKeyId.insert(authKeyId.begin(), strAuthKeyId, strAuthKeyId + xlen);
}

static inline void getNotAfter(X509* x509, std::vector<uint8_t>& notAfterDate) {
const ASN1_TIME* notAfter = X509_get0_notAfter(x509);
if(notAfter == NULL) {
Expand Down Expand Up @@ -334,7 +312,6 @@ static ErrorCode provisionAttestationCertificateParams(std::unique_ptr<se_transp
std::vector<uint8_t> response;
X509 *x509 = NULL;
std::vector<uint8_t> subject;
std::vector<uint8_t> authorityKeyIdentifier;
std::vector<uint8_t> notAfter;

/* Subject, AuthorityKeyIdentifier and Expirty time of the root certificate are required by javacard. */
Expand All @@ -345,8 +322,6 @@ static ErrorCode provisionAttestationCertificateParams(std::unique_ptr<se_transp

/* Get subject in DER */
getDerSubjectName(x509, subject);
/* Get AuthorityKeyIdentifier */
getAuthorityKeyIdentifier(x509, authorityKeyIdentifier);
/* Get Expirty Time */
getNotAfter(x509, notAfter);
/*Free X509 */
Expand All @@ -355,7 +330,6 @@ static ErrorCode provisionAttestationCertificateParams(std::unique_ptr<se_transp
array = cppbor::Array();
array.add(subject);
array.add(notAfter);
array.add(authorityKeyIdentifier);
std::vector<uint8_t> cborData = array.encode();

if(ErrorCode::OK != (errorCode = sendProvisionData(transport, ins, cborData, response))) {
Expand Down