diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2017-01-26 12:16:14 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2017-01-26 12:16:14 +0000 |
| commit | 65492273e6466c04f1c6d4d6571a42d0332ca057 (patch) | |
| tree | 1e012875c21b05abf8cc05044f2195a0ac487a12 /lib/libssl/ssl_rsa.c | |
| parent | 75995d59749c2cd878cc58ce2039d4a6584527cf (diff) | |
Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly
line wraps that resulted
Diffstat (limited to 'lib/libssl/ssl_rsa.c')
| -rw-r--r-- | lib/libssl/ssl_rsa.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c index 3efed227f09..facb8ac2747 100644 --- a/lib/libssl/ssl_rsa.c +++ b/lib/libssl/ssl_rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_rsa.c,v 1.26 2017/01/26 10:40:21 beck Exp $ */ +/* $OpenBSD: ssl_rsa.c,v 1.27 2017/01/26 12:16:13 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -565,8 +565,7 @@ int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey) { if (pkey == NULL) { - SSLerror( - ERR_R_PASSED_NULL_PARAMETER); + SSLerror(ERR_R_PASSED_NULL_PARAMETER); return (0); } if (!ssl_cert_inst(&ctx->internal->cert)) { @@ -602,8 +601,7 @@ SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) j = ERR_R_ASN1_LIB; pkey = d2i_PrivateKey_bio(in, NULL); } else { - SSLerror( - SSL_R_BAD_SSL_FILETYPE); + SSLerror(SSL_R_BAD_SSL_FILETYPE); goto end; } if (pkey == NULL) { |