diff options
| author |   tb <tb@openbsd.org> | 2018-05-18 16:55:58 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-05-18 16:55:58 +0000 |
| commit | fa835c0e5301f990e495f44caa667d14bd012827 (patch) | |
| tree | 2a46cd5f15cb9a00b7434894b8105cf6e3a6cdfc | |
| parent | Revert previous commit; it break reading the RTC on my Cubox-i. (diff) | |
| download | wireguard-openbsd-fa835c0e5301f990e495f44caa667d14bd012827.tar.xz wireguard-openbsd-fa835c0e5301f990e495f44caa667d14bd012827.zip | |
X509_EXTENSION_get_critical(3) now takes a 'const ASN1_OBJECT *obj' and
X509_EXTENSION_set_object(3) a 'const X509_EXTENSION *ex'.
tested in a bulk build by sthen,
ok jsing
| -rw-r--r-- | lib/libcrypto/x509/x509.h | 7 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_v3.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h index ffde40fbfc2..1ddf276a937 100644 --- a/lib/libcrypto/x509/x509.h +++ b/lib/libcrypto/x509/x509.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.h,v 1.50 2018/05/18 14:19:46 tb Exp $ */ +/* $OpenBSD: x509.h,v 1.51 2018/05/18 16:55:58 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1179,13 +1179,14 @@ X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, ASN1_OCTET_STRING *data); X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data); -int X509_EXTENSION_set_object(X509_EXTENSION *ex,ASN1_OBJECT *obj); +int X509_EXTENSION_set_object(X509_EXTENSION *ex, + const ASN1_OBJECT *obj); int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit); int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data); ASN1_OBJECT * X509_EXTENSION_get_object(X509_EXTENSION *ex); ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne); -int X509_EXTENSION_get_critical(X509_EXTENSION *ex); +int X509_EXTENSION_get_critical(const X509_EXTENSION *ex); int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, diff --git a/lib/libcrypto/x509/x509_v3.c b/lib/libcrypto/x509/x509_v3.c index d56a6027957..1b4e89e8932 100644 --- a/lib/libcrypto/x509/x509_v3.c +++ b/lib/libcrypto/x509/x509_v3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_v3.c,v 1.15 2018/05/13 10:25:06 tb Exp $ */ +/* $OpenBSD: x509_v3.c,v 1.16 2018/05/18 16:55:58 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -240,7 +240,7 @@ err: } int -X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) +X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) { if ((ex == NULL) || (obj == NULL)) return (0); @@ -288,7 +288,7 @@ X509_EXTENSION_get_data(X509_EXTENSION *ex) } int -X509_EXTENSION_get_critical(X509_EXTENSION *ex) +X509_EXTENSION_get_critical(const X509_EXTENSION *ex) { if (ex == NULL) return (0); |