summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
authorbeck <>2017-01-26 12:16:13 +0000
committerbeck <>2017-01-26 12:16:13 +0000
commit5ae189b08474853c519a12e66db1c17cfc3c9c8f (patch)
treeb95866f4795db86411300333c648e4ce8e941899 /src/lib/libssl/ssl_ciph.c
parent10f32610e82e44521c0094ae91acbca090d36a58 (diff)
downloadopenbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.tar.gz
openbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.tar.bz2
openbsd-5ae189b08474853c519a12e66db1c17cfc3c9c8f.zip
Finish the fallout of the SSLerr->SSLerror cleanup to get rid of the ugly
line wraps that resulted
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index c1dee99e58..f167244eb4 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.91 2017/01/26 10:40:21 beck Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.92 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 *
@@ -1162,8 +1162,7 @@ ssl_cipher_process_rulestr(const char *rule_str, CIPHER_ORDER **head_p,
1162 * it is no command or separator nor 1162 * it is no command or separator nor
1163 * alphanumeric, so we call this an error. 1163 * alphanumeric, so we call this an error.
1164 */ 1164 */
1165 SSLerror( 1165 SSLerror(SSL_R_INVALID_COMMAND);
1166 SSL_R_INVALID_COMMAND);
1167 retval = found = 0; 1166 retval = found = 0;
1168 l++; 1167 l++;
1169 break; 1168 break;
@@ -1309,8 +1308,7 @@ ssl_cipher_process_rulestr(const char *rule_str, CIPHER_ORDER **head_p,
1309 if ((buflen == 8) && !strncmp(buf, "STRENGTH", 8)) 1308 if ((buflen == 8) && !strncmp(buf, "STRENGTH", 8))
1310 ok = ssl_cipher_strength_sort(head_p, tail_p); 1309 ok = ssl_cipher_strength_sort(head_p, tail_p);
1311 else 1310 else
1312 SSLerror( 1311 SSLerror(SSL_R_INVALID_COMMAND);
1313 SSL_R_INVALID_COMMAND);
1314 if (ok == 0) 1312 if (ok == 0)
1315 retval = 0; 1313 retval = 0;
1316 /* 1314 /*