summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2020-04-18 14:41:05 +0000
committerjsing <>2020-04-18 14:41:05 +0000
commitf62fe75ec63150838efb81a1880bc59c136a3a2e (patch)
tree05ab86dc9d094fa6b2ac0c21f26e6e47baa2e93c /src
parentd82ca953a5e7d61a103ae2e7c9744db82d74f016 (diff)
downloadopenbsd-f62fe75ec63150838efb81a1880bc59c136a3a2e.tar.gz
openbsd-f62fe75ec63150838efb81a1880bc59c136a3a2e.tar.bz2
openbsd-f62fe75ec63150838efb81a1880bc59c136a3a2e.zip
Fix wrapping/indentation.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_ciph.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 5952595c5d..9ba8f40437 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.115 2020/04/18 13:47:58 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.116 2020/04/18 14:41:05 jsing 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 *
@@ -1275,9 +1275,8 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1275 SSLerrorx(ERR_R_MALLOC_FAILURE); 1275 SSLerrorx(ERR_R_MALLOC_FAILURE);
1276 return(NULL); /* Failure */ 1276 return(NULL); /* Failure */
1277 } 1277 }
1278 ssl_cipher_collect_aliases(ca_list, num_of_group_aliases, 1278 ssl_cipher_collect_aliases(ca_list, num_of_group_aliases, disabled_mkey,
1279 disabled_mkey, disabled_auth, disabled_enc, 1279 disabled_auth, disabled_enc, disabled_mac, disabled_ssl, head);
1280 disabled_mac, disabled_ssl, head);
1281 1280
1282 /* 1281 /*
1283 * If the rule_string begins with DEFAULT, apply the default rule 1282 * If the rule_string begins with DEFAULT, apply the default rule