Add support for new TLS AES ciphersuites. Bug 87021.
git-svn-id: svn://10.0.0.236/trunk@103410 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
f978c68393
commit
c4b44f9b2f
@ -116,6 +116,17 @@ const int ssl3CipherSuites[] = {
|
||||
TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA, /* l */
|
||||
TLS_RSA_EXPORT1024_WITH_RC4_56_SHA, /* m */
|
||||
SSL_RSA_WITH_RC4_128_SHA, /* n */
|
||||
TLS_DHE_DSS_WITH_RC4_128_SHA, /* o */
|
||||
SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, /* p */
|
||||
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, /* q */
|
||||
SSL_DHE_RSA_WITH_DES_CBC_SHA, /* r */
|
||||
SSL_DHE_DSS_WITH_DES_CBC_SHA, /* s */
|
||||
TLS_DHE_DSS_WITH_AES_128_CBC_SHA, /* t */
|
||||
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, /* u */
|
||||
TLS_RSA_WITH_AES_128_CBC_SHA, /* v */
|
||||
TLS_DHE_DSS_WITH_AES_256_CBC_SHA, /* w */
|
||||
TLS_DHE_RSA_WITH_AES_256_CBC_SHA, /* x */
|
||||
TLS_RSA_WITH_AES_256_CBC_SHA, /* y */
|
||||
0
|
||||
};
|
||||
|
||||
@ -197,6 +208,8 @@ Usage(const char *progName)
|
||||
"l SSL3 RSA EXPORT WITH DES CBC SHA\t(new)\n"
|
||||
"m SSL3 RSA EXPORT WITH RC4 56 SHA\t(new)\n"
|
||||
"n SSL3 RSA WITH RC4 128 SHA\n"
|
||||
"v TLS_RSA_WITH_AES_128_CBC_SHA\n"
|
||||
"y TLS_RSA_WITH_AES_256_CBC_SHA\n"
|
||||
,progName);
|
||||
}
|
||||
|
||||
|
||||
@ -99,6 +99,17 @@ int ssl3CipherSuites[] = {
|
||||
TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA, /* l */
|
||||
TLS_RSA_EXPORT1024_WITH_RC4_56_SHA, /* m */
|
||||
SSL_RSA_WITH_RC4_128_SHA, /* n */
|
||||
TLS_DHE_DSS_WITH_RC4_128_SHA, /* o */
|
||||
SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, /* p */
|
||||
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, /* q */
|
||||
SSL_DHE_RSA_WITH_DES_CBC_SHA, /* r */
|
||||
SSL_DHE_DSS_WITH_DES_CBC_SHA, /* s */
|
||||
TLS_DHE_DSS_WITH_AES_128_CBC_SHA, /* t */
|
||||
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, /* u */
|
||||
TLS_RSA_WITH_AES_128_CBC_SHA, /* v */
|
||||
TLS_DHE_DSS_WITH_AES_256_CBC_SHA, /* w */
|
||||
TLS_DHE_RSA_WITH_AES_256_CBC_SHA, /* x */
|
||||
TLS_RSA_WITH_AES_256_CBC_SHA, /* y */
|
||||
0
|
||||
};
|
||||
|
||||
|
||||
@ -97,6 +97,12 @@ int ssl3CipherSuites[] = {
|
||||
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, /* q */
|
||||
SSL_DHE_RSA_WITH_DES_CBC_SHA, /* r */
|
||||
SSL_DHE_DSS_WITH_DES_CBC_SHA, /* s */
|
||||
TLS_DHE_DSS_WITH_AES_128_CBC_SHA, /* t */
|
||||
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, /* u */
|
||||
TLS_RSA_WITH_AES_128_CBC_SHA, /* v */
|
||||
TLS_DHE_DSS_WITH_AES_256_CBC_SHA, /* w */
|
||||
TLS_DHE_RSA_WITH_AES_256_CBC_SHA, /* x */
|
||||
TLS_RSA_WITH_AES_256_CBC_SHA, /* y */
|
||||
0
|
||||
};
|
||||
|
||||
@ -214,6 +220,12 @@ static void Usage(const char *progName)
|
||||
"q SSL3 DHE DSS WITH 3DES EDE CBC SHA\n"
|
||||
"r SSL3 DHE RSA WITH DES CBC SHA\n"
|
||||
"s SSL3 DHE DSS WITH DES CBC SHA\n"
|
||||
"t TLS_DHE_DSS_WITH_AES_128_CBC_SHA\n"
|
||||
"u TLS_DHE_RSA_WITH_AES_128_CBC_SHA\n"
|
||||
"v TLS_RSA_WITH_AES_128_CBC_SHA\n"
|
||||
"w TLS_DHE_DSS_WITH_AES_256_CBC_SHA\n"
|
||||
"x TLS_DHE_RSA_WITH_AES_256_CBC_SHA\n"
|
||||
"y TLS_RSA_WITH_AES_256_CBC_SHA\n"
|
||||
);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user