generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixups from previous commit.

Browse Source
This commit is contained in:
Ben Laurie 2013-01-29 18:06:08 +00:00 committed by Dr. Stephen Henson
parent f852b60797
commit 080f395392
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/evp/c_allc.c
View 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");
EVP_add_cipher_alias(SN_aes_256_cbc,"aes256"); EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
#endif #endif
#endif
#ifndef OPENSSL_NO_CAMELLIA #ifndef OPENSSL_NO_CAMELLIA
EVP_add_cipher(EVP_camellia_128_ecb()); EVP_add_cipher(EVP_camellia_128_ecb());

3
ssl/s3_cbc.c
View File

@ -139,8 +139,7 @@ int tls1_cbc_remove_padding(const SSL* s,
unsigned mac_size) unsigned mac_size)
{ {
unsigned padding_length, good, to_check, i; unsigned padding_length, good, to_check, i;
const char has_explicit_iv = const char has_explicit_iv = s->version == DTLS1_VERSION;
s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION;
const unsigned overhead = 1 /* padding length byte */ + const unsigned overhead = 1 /* padding length byte */ +
mac_size + mac_size +
(has_explicit_iv ? block_size : 0); (has_explicit_iv ? block_size : 0);

1
ssl/ssl_algs.c
View File

@ -87,7 +87,6 @@ int SSL_library_init(void)
EVP_add_cipher(EVP_aes_256_cbc()); EVP_add_cipher(EVP_aes_256_cbc());
#endif #endif
#endif
#ifndef OPENSSL_NO_CAMELLIA #ifndef OPENSSL_NO_CAMELLIA
EVP_add_cipher(EVP_camellia_128_cbc()); EVP_add_cipher(EVP_camellia_128_cbc());
EVP_add_cipher(EVP_camellia_256_cbc()); EVP_add_cipher(EVP_camellia_256_cbc());

1
ssl/t1_enc.c
View File

@ -641,6 +641,7 @@ int tls1_enc(SSL *s, int send)
EVP_CIPHER_CTX *ds; EVP_CIPHER_CTX *ds;
unsigned long l; unsigned long l;
int bs,i,j,k,pad=0,ret,mac_size=0; int bs,i,j,k,pad=0,ret,mac_size=0;
int n;
const EVP_CIPHER *enc; const EVP_CIPHER *enc;
if (send) if (send)