• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

TLS/SSL and crypto library


コミットメタ情報

リビジョン22b52164aaed31d6e93dbd2d397ace041360e6aa (tree)
日時2015-01-22 18:20:09
作者Matt Caswell <matt@open...>
コミッターMatt Caswell

ログメッセージ

More tweaks for comments due indent issues

Conflicts:
ssl/ssl_ciph.c
ssl/ssl_locl.h

Conflicts:
ssl/s2_srvr.c
ssl/ssl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>

変更サマリ

差分

--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -264,7 +264,8 @@ static const SSL_CIPHER cipher_aliases[]={
264264 {0,SSL_TXT_DSS,0, 0,SSL_aDSS, 0,0,0,0,0,0,0},
265265 {0,SSL_TXT_aKRB5,0, 0,SSL_aKRB5, 0,0,0,0,0,0,0},
266266 {0,SSL_TXT_aNULL,0, 0,SSL_aNULL, 0,0,0,0,0,0,0},
267- {0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0}, /* no such ciphersuites supported! */
267+ /* no such ciphersuites supported! */
268+ {0,SSL_TXT_aDH,0, 0,SSL_aDH, 0,0,0,0,0,0,0},
268269 {0,SSL_TXT_aECDH,0, 0,SSL_aECDH, 0,0,0,0,0,0,0},
269270 {0,SSL_TXT_aECDSA,0, 0,SSL_aECDSA,0,0,0,0,0,0,0},
270271 {0,SSL_TXT_ECDSA,0, 0,SSL_aECDSA, 0,0,0,0,0,0,0},