diff options
| author |   tb <tb@openbsd.org> | 2018-03-17 15:39:43 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-03-17 15:39:43 +0000 |
| commit | 251439a278ac332fbab50b130074c211075e1b2a (patch) | |
| tree | c769c03a7dd0ca600fd4cf61bf5b7ec372083e2e | |
| parent | Provide X509_NAME_ENTRY_set() (diff) | |
| download | wireguard-openbsd-251439a278ac332fbab50b130074c211075e1b2a.tar.xz wireguard-openbsd-251439a278ac332fbab50b130074c211075e1b2a.zip | |
Provide X509_OBJECT_get_type(). Instead of the X509_LOOKUP_TYPE enum
(which we don't have) it returns a plain int.
ok jsing
| -rw-r--r-- | lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_lu.c | 8 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_vfy.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index cd43f26e68c..4410cce6391 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -2765,6 +2765,7 @@ X509_NAME_set X509_OBJECT_free_contents X509_OBJECT_get0_X509 X509_OBJECT_get0_X509_CRL +X509_OBJECT_get_type X509_OBJECT_idx_by_subject X509_OBJECT_retrieve_by_subject X509_OBJECT_retrieve_match diff --git a/lib/libcrypto/x509/x509_lu.c b/lib/libcrypto/x509/x509_lu.c index 9276a0e2d5d..0033069b3e3 100644 --- a/lib/libcrypto/x509/x509_lu.c +++ b/lib/libcrypto/x509/x509_lu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_lu.c,v 1.26 2018/02/22 17:19:31 jsing Exp $ */ +/* $OpenBSD: x509_lu.c,v 1.27 2018/03/17 15:39:43 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -458,6 +458,12 @@ X509_OBJECT_up_ref_count(X509_OBJECT *a) } } +int +X509_OBJECT_get_type(const X509_OBJECT *a) +{ + return a->type; +} + void X509_OBJECT_free_contents(X509_OBJECT *a) { diff --git a/lib/libcrypto/x509/x509_vfy.h b/lib/libcrypto/x509/x509_vfy.h index f9b215ee65a..3ee26ccd7be 100644 --- a/lib/libcrypto/x509/x509_vfy.h +++ b/lib/libcrypto/x509/x509_vfy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.h,v 1.24 2018/02/22 17:19:31 jsing Exp $ */ +/* $OpenBSD: x509_vfy.h,v 1.25 2018/03/17 15:39:43 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -425,6 +425,7 @@ int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, int type, X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,int type,X509_NAME *name); X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h, X509_OBJECT *x); void X509_OBJECT_up_ref_count(X509_OBJECT *a); +int X509_OBJECT_get_type(const X509_OBJECT *a); void X509_OBJECT_free_contents(X509_OBJECT *a); X509 *X509_OBJECT_get0_X509(const X509_OBJECT *xo); X509_CRL *X509_OBJECT_get0_X509_CRL(X509_OBJECT *xo); |