diff options
| author | beck <> | 2017-01-26 12:16:13 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-26 12:16:13 +0000 |
| commit | a141ed2bc17672028f4c648479f1cc3c598be1e9 (patch) | |
| tree | b95866f4795db86411300333c648e4ce8e941899 /src/lib/libssl/ssl_cert.c | |
| parent | 1a96ea530f5a98c5ea5a032e03e2afd29bf0a1dd (diff) | |
| download | openbsd-a141ed2bc17672028f4c648479f1cc3c598be1e9.tar.gz openbsd-a141ed2bc17672028f4c648479f1cc3c598be1e9.tar.bz2 openbsd-a141ed2bc17672028f4c648479f1cc3c598be1e9.zip | |
Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly
line wraps that resulted
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_cert.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 4f714f751a..e608bcfea4 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_cert.c,v 1.61 2017/01/26 10:40:21 beck Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.62 2017/01/26 12:16:13 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 | * |
| @@ -587,8 +587,7 @@ SSL_load_client_CA_file(const char *file) | |||
| 587 | if (ret == NULL) { | 587 | if (ret == NULL) { |
| 588 | ret = sk_X509_NAME_new_null(); | 588 | ret = sk_X509_NAME_new_null(); |
| 589 | if (ret == NULL) { | 589 | if (ret == NULL) { |
| 590 | SSLerror( | 590 | SSLerror(ERR_R_MALLOC_FAILURE); |
| 591 | ERR_R_MALLOC_FAILURE); | ||
| 592 | goto err; | 591 | goto err; |
| 593 | } | 592 | } |
| 594 | } | 593 | } |
| @@ -643,8 +642,7 @@ SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, | |||
| 643 | in = BIO_new(BIO_s_file_internal()); | 642 | in = BIO_new(BIO_s_file_internal()); |
| 644 | 643 | ||
| 645 | if (in == NULL) { | 644 | if (in == NULL) { |
| 646 | SSLerror( | 645 | SSLerror(ERR_R_MALLOC_FAILURE); |
| 647 | ERR_R_MALLOC_FAILURE); | ||
| 648 | goto err; | 646 | goto err; |
| 649 | } | 647 | } |
| 650 | 648 | ||
