Another comment change. (Previous comment does not apply

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 5908bb94f805708249914cf312b75351bfcc5a33..700a4ddbbf473e489d11c889db812d1f584e0108 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -615,6 +615,8 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        SSL_ALL_STRENGTHS,
        },
 #endif /* NO_KRB5 */
+
+
 #if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
        /* New TLS Export CipherSuites */
        /* Cipher 60 */
@@ -709,6 +711,165 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
            SSL_ALL_STRENGTHS
            },
 #endif
+       /* New AES ciphersuites */
+
+       /* Cipher 2F */
+           {
+           1,
+           TLS1_TXT_RSA_WITH_AES_128_SHA,
+           TLS1_CK_RSA_WITH_AES_128_SHA,
+           SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 30 */
+           {
+           0,
+           TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
+           TLS1_CK_DH_DSS_WITH_AES_128_SHA,
+           SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 31 */
+           {
+           0,
+           TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
+           TLS1_CK_DH_RSA_WITH_AES_128_SHA,
+           SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 32 */
+           {
+           1,
+           TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
+           TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
+           SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 33 */
+           {
+           1,
+           TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
+           TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
+           SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 34 */
+           {
+           1,
+           TLS1_TXT_ADH_WITH_AES_128_SHA,
+           TLS1_CK_ADH_WITH_AES_128_SHA,
+           SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_MEDIUM,
+           0,
+           128,
+           128,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+
+       /* Cipher 35 */
+           {
+           1,
+           TLS1_TXT_RSA_WITH_AES_256_SHA,
+           TLS1_CK_RSA_WITH_AES_256_SHA,
+           SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 36 */
+           {
+           0,
+           TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
+           TLS1_CK_DH_DSS_WITH_AES_256_SHA,
+           SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 37 */
+           {
+           0,
+           TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
+           TLS1_CK_DH_RSA_WITH_AES_256_SHA,
+           SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 38 */
+           {
+           1,
+           TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
+           TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
+           SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 39 */
+           {
+           1,
+           TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
+           TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
+           SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
+       /* Cipher 3A */
+           {
+           1,
+           TLS1_TXT_ADH_WITH_AES_256_SHA,
+           TLS1_CK_ADH_WITH_AES_256_SHA,
+           SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
+           SSL_NOT_EXP|SSL_HIGH,
+           0,
+           256,
+           256,
+           SSL_ALL_CIPHERS,
+           SSL_ALL_STRENGTHS,
+           },
 
 /* end of list */
        };
@@ -782,8 +943,7 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u)
 
 int ssl3_pending(SSL *s)
        {
-       /* The problem is that it may not be the correct record type */
-       return(s->s3->rrec.length); /* FIXME */
+       return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
        }
 
 int ssl3_new(SSL *s)
@@ -1431,7 +1591,7 @@ int ssl3_read(SSL *s, void *buf, int len)
 
 int ssl3_peek(SSL *s, char *buf, int len)
        {
-       return ssl3_read_internal(s, buf, len, 0);
+       return ssl3_read_internal(s, buf, len, 1);
        }
 
 int ssl3_renegotiate(SSL *s)