diff options
author | beck <> | 2017-01-29 17:49:23 +0000 |
---|---|---|
committer | beck <> | 2017-01-29 17:49:23 +0000 |
commit | 957b11334a7afb14537322f0e4795b2e368b3f59 (patch) | |
tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/asn1/t_x509.c | |
parent | df96e020e729c6c37a8c7fe311fdd1fe6a8718c5 (diff) | |
download | openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.gz openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.tar.bz2 openbsd-957b11334a7afb14537322f0e4795b2e368b3f59.zip |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/asn1/t_x509.c')
-rw-r--r-- | src/lib/libcrypto/asn1/t_x509.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c index 1c83fc5608..14cbabedc7 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.26 2015/02/07 13:19:15 doug Exp $ */ | 1 | /* $OpenBSD: t_x509.c,v 1.27 2017/01/29 17:49:22 beck 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 | * |
@@ -92,7 +92,7 @@ X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cflag) | |||
92 | int ret; | 92 | int ret; |
93 | 93 | ||
94 | if ((b = BIO_new(BIO_s_file())) == NULL) { | 94 | if ((b = BIO_new(BIO_s_file())) == NULL) { |
95 | X509err(X509_F_X509_PRINT_EX_FP, ERR_R_BUF_LIB); | 95 | X509error(ERR_R_BUF_LIB); |
96 | return (0); | 96 | return (0); |
97 | } | 97 | } |
98 | BIO_set_fp(b, fp, BIO_NOCLOSE); | 98 | BIO_set_fp(b, fp, BIO_NOCLOSE); |
@@ -530,7 +530,7 @@ X509_NAME_print(BIO *bp, X509_NAME *name, int obase) | |||
530 | ret = 1; | 530 | ret = 1; |
531 | if (0) { | 531 | if (0) { |
532 | err: | 532 | err: |
533 | X509err(X509_F_X509_NAME_PRINT, ERR_R_BUF_LIB); | 533 | X509error(ERR_R_BUF_LIB); |
534 | } | 534 | } |
535 | free(b); | 535 | free(b); |
536 | return (ret); | 536 | return (ret); |