diff options
author | tb <> | 2018-05-18 18:23:24 +0000 |
---|---|---|
committer | tb <> | 2018-05-18 18:23:24 +0000 |
commit | d180944018d8d319ba290f2f92f863d5ce1e81a1 (patch) | |
tree | f74816e3f1936d966799b3a802febcb8fb45f2df /src | |
parent | cb3c4e2da5b39e3aad1468bbce16140bf963f627 (diff) | |
download | openbsd-d180944018d8d319ba290f2f92f863d5ce1e81a1.tar.gz openbsd-d180944018d8d319ba290f2f92f863d5ce1e81a1.tar.bz2 openbsd-d180944018d8d319ba290f2f92f863d5ce1e81a1.zip |
Add a const qualifier to the 'X509_NAME *' argument of
X509_NAME_print{,_ex{,_fp}}(3).
tested in a bulk build by sthen
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/asn1/a_strex.c | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/t_x509.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 10 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c index c0f0d7634d..a8b5595db9 100644 --- a/src/lib/libcrypto/asn1/a_strex.c +++ b/src/lib/libcrypto/asn1/a_strex.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_strex.c,v 1.26 2018/04/25 11:48:21 tb Exp $ */ | 1 | /* $OpenBSD: a_strex.c,v 1.27 2018/05/18 18:23:24 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2000. | 3 | * project 2000. |
4 | */ | 4 | */ |
@@ -440,7 +440,7 @@ do_indent(char_io *io_ch, void *arg, int indent) | |||
440 | #define FN_WIDTH_SN 10 | 440 | #define FN_WIDTH_SN 10 |
441 | 441 | ||
442 | static int | 442 | static int |
443 | do_name_ex(char_io *io_ch, void *arg, X509_NAME *n, int indent, | 443 | do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n, int indent, |
444 | unsigned long flags) | 444 | unsigned long flags) |
445 | { | 445 | { |
446 | int i, prev = -1, orflags, cnt; | 446 | int i, prev = -1, orflags, cnt; |
@@ -582,7 +582,8 @@ do_name_ex(char_io *io_ch, void *arg, X509_NAME *n, int indent, | |||
582 | /* Wrappers round the main functions */ | 582 | /* Wrappers round the main functions */ |
583 | 583 | ||
584 | int | 584 | int |
585 | X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags) | 585 | X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent, |
586 | unsigned long flags) | ||
586 | { | 587 | { |
587 | if (flags == XN_FLAG_COMPAT) | 588 | if (flags == XN_FLAG_COMPAT) |
588 | return X509_NAME_print(out, nm, indent); | 589 | return X509_NAME_print(out, nm, indent); |
@@ -590,7 +591,8 @@ X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags) | |||
590 | } | 591 | } |
591 | 592 | ||
592 | int | 593 | int |
593 | X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags) | 594 | X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent, |
595 | unsigned long flags) | ||
594 | { | 596 | { |
595 | if (flags == XN_FLAG_COMPAT) { | 597 | if (flags == XN_FLAG_COMPAT) { |
596 | BIO *btmp; | 598 | BIO *btmp; |
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c index 59b308e763..e287a6cf6a 100644 --- a/src/lib/libcrypto/asn1/t_x509.c +++ b/src/lib/libcrypto/asn1/t_x509.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t_x509.c,v 1.30 2018/05/01 19:01:27 tb Exp $ */ | 1 | /* $OpenBSD: t_x509.c,v 1.31 2018/05/18 18:23:24 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 | * |
@@ -490,7 +490,7 @@ err: | |||
490 | } | 490 | } |
491 | 491 | ||
492 | int | 492 | int |
493 | X509_NAME_print(BIO *bp, X509_NAME *name, int obase) | 493 | X509_NAME_print(BIO *bp, const X509_NAME *name, int obase) |
494 | { | 494 | { |
495 | char *s, *c, *b; | 495 | char *s, *c, *b; |
496 | int ret = 0, l, i; | 496 | int ret = 0, l, i; |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index bbbb174eb1..d4efaf3eca 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.59 2018/05/18 18:19:31 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.60 2018/05/18 18:23:24 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 | * |
@@ -1076,11 +1076,13 @@ int X509_print_ex_fp(FILE *bp,X509 *x, unsigned long nmflag, unsigned long cfla | |||
1076 | int X509_print_fp(FILE *bp,X509 *x); | 1076 | int X509_print_fp(FILE *bp,X509 *x); |
1077 | int X509_CRL_print_fp(FILE *bp,X509_CRL *x); | 1077 | int X509_CRL_print_fp(FILE *bp,X509_CRL *x); |
1078 | int X509_REQ_print_fp(FILE *bp,X509_REQ *req); | 1078 | int X509_REQ_print_fp(FILE *bp,X509_REQ *req); |
1079 | int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags); | 1079 | int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent, |
1080 | unsigned long flags); | ||
1080 | 1081 | ||
1081 | #ifndef OPENSSL_NO_BIO | 1082 | #ifndef OPENSSL_NO_BIO |
1082 | int X509_NAME_print(BIO *bp, X509_NAME *name, int obase); | 1083 | int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase); |
1083 | int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags); | 1084 | int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent, |
1085 | unsigned long flags); | ||
1084 | int X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag); | 1086 | int X509_print_ex(BIO *bp,X509 *x, unsigned long nmflag, unsigned long cflag); |
1085 | int X509_print(BIO *bp,X509 *x); | 1087 | int X509_print(BIO *bp,X509 *x); |
1086 | int X509_ocspid_print(BIO *bp,X509 *x); | 1088 | int X509_ocspid_print(BIO *bp,X509 *x); |