kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary CBS_get_asn1_element.

Browse Source 
EVP_parse_public_key already acts like CBS_get_* in that it peels one
element off and leaves a remainder.

Change-Id: Ic90952785005ed81664a6f46503b13ecd293176c
Reviewed-on: https://boringssl-review.googlesource.com/13045
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
This commit is contained in:
David Benjamin 2017-01-03 08:08:57 -05:00
parent 1aa4a5bdbd
commit 5b410b6bec
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/ssl_cert.c
View File

@ -652,14 +652,13 @@ static int ssl_cert_skip_to_spki(const CBS *in, CBS *out_tbs_cert) {
} }
EVP_PKEY *ssl_cert_parse_pubkey(const CBS *in) { EVP_PKEY *ssl_cert_parse_pubkey(const CBS *in) {
CBS buf = *in, tbs_cert, spki; CBS buf = *in, tbs_cert;
if (!ssl_cert_skip_to_spki(&buf, &tbs_cert) || if (!ssl_cert_skip_to_spki(&buf, &tbs_cert)) {
!CBS_get_asn1_element(&tbs_cert, &spki, CBS_ASN1_SEQUENCE)) {
OPENSSL_PUT_ERROR(SSL, SSL_R_CANNOT_PARSE_LEAF_CERT); OPENSSL_PUT_ERROR(SSL, SSL_R_CANNOT_PARSE_LEAF_CERT);
return NULL; return NULL;
} }
return EVP_parse_public_key(&spki); return EVP_parse_public_key(&tbs_cert);
} }
int ssl_cert_check_digital_signature_key_usage(const CBS *in) { int ssl_cert_check_digital_signature_key_usage(const CBS *in) {