diff options
author | tb <> | 2018-05-19 10:54:40 +0000 |
---|---|---|
committer | tb <> | 2018-05-19 10:54:40 +0000 |
commit | 7e46400ff4b50669268226bc13b97860d5e8c7dd (patch) | |
tree | 767cbdb2bfdd7e42781794f335e233a16c31d342 | |
parent | 6827cc3b1755c493f24f9fd40b88404497bc961d (diff) | |
download | openbsd-7e46400ff4b50669268226bc13b97860d5e8c7dd.tar.gz openbsd-7e46400ff4b50669268226bc13b97860d5e8c7dd.tar.bz2 openbsd-7e46400ff4b50669268226bc13b97860d5e8c7dd.zip |
Add const to the 'obj' argument of X509_EXTENSION_create_by_OBJ().
tested in a bulk build by sthen
ok jsing
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_v3.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index e77d090d96..26568eacdd 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.65 2018/05/18 19:28:27 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.66 2018/05/19 10:54:40 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 | * |
@@ -1186,7 +1186,7 @@ int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, | |||
1186 | X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, | 1186 | X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, |
1187 | int nid, int crit, ASN1_OCTET_STRING *data); | 1187 | int nid, int crit, ASN1_OCTET_STRING *data); |
1188 | X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, | 1188 | X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, |
1189 | ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data); | 1189 | const ASN1_OBJECT *obj, int crit, ASN1_OCTET_STRING *data); |
1190 | int X509_EXTENSION_set_object(X509_EXTENSION *ex, | 1190 | int X509_EXTENSION_set_object(X509_EXTENSION *ex, |
1191 | const ASN1_OBJECT *obj); | 1191 | const ASN1_OBJECT *obj); |
1192 | int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit); | 1192 | int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit); |
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c index 1b4e89e893..524d5511ed 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.16 2018/05/18 16:55:58 tb Exp $ */ | 1 | /* $OpenBSD: x509_v3.c,v 1.17 2018/05/19 10:54:40 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 | * |
@@ -209,8 +209,8 @@ X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid, int crit, | |||
209 | } | 209 | } |
210 | 210 | ||
211 | X509_EXTENSION * | 211 | X509_EXTENSION * |
212 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, ASN1_OBJECT *obj, int crit, | 212 | X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj, |
213 | ASN1_OCTET_STRING *data) | 213 | int crit, ASN1_OCTET_STRING *data) |
214 | { | 214 | { |
215 | X509_EXTENSION *ret; | 215 | X509_EXTENSION *ret; |
216 | 216 | ||