projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df6741c
)
More tweaks for comments due indent issues
master-pre-auto-reformat
author
Matt Caswell
<matt@openssl.org>
Wed, 21 Jan 2015 23:54:59 +0000
(23:54 +0000)
committer
Matt Caswell
<matt@openssl.org>
Thu, 22 Jan 2015 09:20:09 +0000
(09:20 +0000)
Conflicts:
ssl/ssl_ciph.c
ssl/ssl_locl.h
Conflicts:
ssl/s2_srvr.c
ssl/ssl.h
Reviewed-by: Tim Hudson <tjh@openssl.org>
ssl/ssl_ciph.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index a046c71e2f30b2dac9e459a577c1eccb8842957c..4ce5d8e01f1a145182470a22342f781e37d84115 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-264,7
+264,8
@@
static const SSL_CIPHER cipher_aliases[]={
{0,SSL_TXT_DSS,0, 0,SSL_aDSS, 0,0,0,0,0,0,0},
{0,SSL_TXT_aKRB5,0, 0,SSL_aKRB5, 0,0,0,0,0,0,0},
{0,SSL_TXT_aNULL,0, 0,SSL_aNULL, 0,0,0,0,0,0,0},
- {0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
+ /* no such ciphersuites supported! */
+ {0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0},
{0,SSL_TXT_aECDH,0, 0,SSL_aECDH, 0,0,0,0,0,0,0},
{0,SSL_TXT_aECDSA,0, 0,SSL_aECDSA,0,0,0,0,0,0,0},
{0,SSL_TXT_ECDSA,0, 0,SSL_aECDSA, 0,0,0,0,0,0,0},