diff options
| author | Matt Caswell <matt@openssl.org> | 2014-11-18 15:03:55 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-11-27 21:40:39 +0000 |
| commit | 81ec01b21767da5e5f0c03ad79b4d3dc9b632393 (patch) | |
| tree | d052210d73a56a894839d29e68bbabf915c902d1 /ssl/s2_pkt.c | |
| parent | 4b87706d20f0a2fdf2e8f1b90256e141c487ef47 (diff) | |
Check EVP_Cipher return values for SSL2
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s2_pkt.c')
| -rw-r--r-- | ssl/s2_pkt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c index 8bb6ab8baa..acd61dc546 100644 --- a/ssl/s2_pkt.c +++ b/ssl/s2_pkt.c @@ -265,7 +265,11 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek) if ((!s->s2->clear_text) && (s->s2->rlength >= (unsigned int)mac_size)) { - ssl2_enc(s,0); + if(!ssl2_enc(s,0)) + { + SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_DECRYPTION_FAILED); + return(-1); + } s->s2->ract_data_length-=mac_size; ssl2_mac(s,mac,0); s->s2->ract_data_length-=s->s2->padding; @@ -616,7 +620,8 @@ static int n_do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len) s->s2->wact_data_length=len+p; ssl2_mac(s,s->s2->mac_data,1); s->s2->wlength+=p+mac_size; - ssl2_enc(s,1); + if(ssl2_enc(s,1) < 1) + return -1; } /* package up the header */ |