diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 7 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index ffde40fbfc..1ddf276a93 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.50 2018/05/18 14:19:46 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.51 2018/05/18 16:55:58 tb 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 | * |
@@ -1179,13 +1179,14 @@ X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, | |||
1179 | int nid, int crit, ASN1_OCTET_STRING *data); | 1179 | int nid, int crit, ASN1_OCTET_STRING *data); |
1180 | X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, | 1180 | X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, |
1181 | ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data); | 1181 | ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data); |
1182 | int X509_EXTENSION_set_object(X509_EXTENSION *ex,ASN1_OBJECT *obj); | 1182 | int X509_EXTENSION_set_object(X509_EXTENSION *ex, |
1183 | const ASN1_OBJECT *obj); | ||
1183 | int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit); | 1184 | int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit); |
1184 | int X509_EXTENSION_set_data(X509_EXTENSION *ex, | 1185 | int X509_EXTENSION_set_data(X509_EXTENSION *ex, |
1185 | ASN1_OCTET_STRING *data); | 1186 | ASN1_OCTET_STRING *data); |
1186 | ASN1_OBJECT * X509_EXTENSION_get_object(X509_EXTENSION *ex); | 1187 | ASN1_OBJECT * X509_EXTENSION_get_object(X509_EXTENSION *ex); |
1187 | ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne); | 1188 | ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne); |
1188 | int X509_EXTENSION_get_critical(X509_EXTENSION *ex); | 1189 | int X509_EXTENSION_get_critical(const X509_EXTENSION *ex); |
1189 | 1190 | ||
1190 | int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); | 1191 | int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); |
1191 | int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, | 1192 | int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, |
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index d56a602795..1b4e89e893 100644 --- a/src/lib/libcrypto/x509/x509_v3.c +++ b/src/lib/libcrypto/x509/x509_v3.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_v3.c,v 1.15 2018/05/13 10:25:06 tb Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.16 2018/05/18 16:55:58 tb 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 | * |
@@ -240,7 +240,7 @@ err: | |||
240 | } | 240 | } |
241 | 241 | ||
242 | int | 242 | int |
243 | X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj) | 243 | X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj) |
244 | { | 244 | { |
245 | if ((ex == NULL) || (obj == NULL)) | 245 | if ((ex == NULL) || (obj == NULL)) |
246 | return (0); | 246 | return (0); |
@@ -288,7 +288,7 @@ X509_EXTENSION_get_data(X509_EXTENSION *ex) | |||
288 | } | 288 | } |
289 | 289 | ||
290 | int | 290 | int |
291 | X509_EXTENSION_get_critical(X509_EXTENSION *ex) | 291 | X509_EXTENSION_get_critical(const X509_EXTENSION *ex) |
292 | { | 292 | { |
293 | if (ex == NULL) | 293 | if (ex == NULL) |
294 | return (0); | 294 | return (0); |