diff options
| author | appro <appro> | 2012-03-13 19:20:55 +0000 |
|---|---|---|
| committer | appro <appro> | 2012-03-13 19:20:55 +0000 |
| commit | 211846e4a59368708f7bf38754eb60dbba80fef1 (patch) | |
| tree | ab116bef742c7e6f78fe750861cb9b676240db02 | |
| parent | 268367bc0e66289c16598910c4cf136cfea12634 (diff) | |
| download | openssl-211846e4a59368708f7bf38754eb60dbba80fef1.tar.gz | |
ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER.
| -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 f32393c56..201ca9ad6 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) { |