Fixups from previous commit.

diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index e67022fc6f97b4ea912b537bb746252fcffced79..c5f9268378b0756ae8651220a3ece597a446b7c4 100644 (file)
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -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());

diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index e9b112c1b589510aff18ef39cace825b4529ce2b..6c5d43e42fa40ed2854b85ab0fee33fa44e816e0 100644 (file)
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -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);

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 7f1a042b3d8908b3db3cdc729d7ffe1b6aab8d55..7de975da00f2d80a69c95ab0257532ed40a5f826 100644 (file)
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -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());

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 3fcb77b4dc9949329ea629bb2589b55befa66161..0cb3c56478d6a57a338b9a01859d7840c830f53c 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -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)