Fixups from previous commit.
authorBen Laurie <ben@links.org>
Tue, 29 Jan 2013 18:06:08 +0000 (18:06 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 5 Feb 2013 16:46:17 +0000 (16:46 +0000)
crypto/evp/c_allc.c
ssl/s3_cbc.c
ssl/ssl_algs.c
ssl/t1_enc.c

index e67022f..c5f9268 100644 (file)
@@ -194,7 +194,6 @@ void OpenSSL_add_all_ciphers(void)
        EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
        EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
 #endif
-#endif
 
 #ifndef OPENSSL_NO_CAMELLIA
        EVP_add_cipher(EVP_camellia_128_ecb());
index e9b112c..6c5d43e 100644 (file)
@@ -139,8 +139,7 @@ int tls1_cbc_remove_padding(const SSL* s,
                            unsigned mac_size)
        {
        unsigned padding_length, good, to_check, i;
-       const char has_explicit_iv =
-               s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION;
+       const char has_explicit_iv = s->version == DTLS1_VERSION;
        const unsigned overhead = 1 /* padding length byte */ +
                                  mac_size +
                                  (has_explicit_iv ? block_size : 0);
index 7f1a042..7de975d 100644 (file)
@@ -87,7 +87,6 @@ int SSL_library_init(void)
        EVP_add_cipher(EVP_aes_256_cbc());
 #endif
 
-#endif
 #ifndef OPENSSL_NO_CAMELLIA
        EVP_add_cipher(EVP_camellia_128_cbc());
        EVP_add_cipher(EVP_camellia_256_cbc());
index 3fcb77b..0cb3c56 100644 (file)
@@ -641,6 +641,7 @@ int tls1_enc(SSL *s, int send)
        EVP_CIPHER_CTX *ds;
        unsigned long l;
        int bs,i,j,k,pad=0,ret,mac_size=0;
+       int n;
        const EVP_CIPHER *enc;
 
        if (send)