diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_cmp.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_cmp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c index 72fbef1544..440467521b 100644 --- a/src/lib/libcrypto/x509/x509_cmp.c +++ b/src/lib/libcrypto/x509/x509_cmp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_cmp.c,v 1.27 2017/01/29 17:49:23 beck Exp $ */ | 1 | /* $OpenBSD: x509_cmp.c,v 1.28 2018/02/22 17:05:35 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -321,11 +321,17 @@ X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name) | |||
321 | EVP_PKEY * | 321 | EVP_PKEY * |
322 | X509_get_pubkey(X509 *x) | 322 | X509_get_pubkey(X509 *x) |
323 | { | 323 | { |
324 | if ((x == NULL) || (x->cert_info == NULL)) | 324 | if (x == NULL || x->cert_info == NULL) |
325 | return (NULL); | 325 | return (NULL); |
326 | return (X509_PUBKEY_get(x->cert_info->key)); | 326 | return (X509_PUBKEY_get(x->cert_info->key)); |
327 | } | 327 | } |
328 | 328 | ||
329 | EVP_PKEY * | ||
330 | X509_get0_pubkey(X509 *x) | ||
331 | { | ||
332 | return X509_get_pubkey(x); | ||
333 | } | ||
334 | |||
329 | ASN1_BIT_STRING * | 335 | ASN1_BIT_STRING * |
330 | X509_get0_pubkey_bitstr(const X509 *x) | 336 | X509_get0_pubkey_bitstr(const X509 *x) |
331 | { | 337 | { |