diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-03-13 19:21:15 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-03-13 19:21:15 +0000 |
| commit | 9cc42cb091c5c8beb69baaf84736e4f8f20668d1 (patch) | |
| tree | cfa7e620481a8e9db4a72c554da4f1c73ccdc5b2 /ssl | |
| parent | bcf9cf89e70a6d15898e25e972e1234729add189 (diff) | |
ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER [from HEAD].
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_enc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index f32393c56b..201ca9ad6d 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -825,7 +825,10 @@ int tls1_enc(SSL *s, int send) } } - if (EVP_Cipher(ds,rec->data,rec->input,l) < 0) + i = EVP_Cipher(ds,rec->data,rec->input,l); + if ((EVP_CIPHER_flags(ds->cipher)&EVP_CIPH_FLAG_CUSTOM_CIPHER) + ?(i<0) + :(i==0)) return -1; /* AEAD can fail to verify MAC */ if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send) { |