diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-09-23 23:43:49 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-09-23 23:43:49 +0000 |
commit | b6dcdbfc94c482f6c15ba725754fc9e827e41851 (patch) | |
tree | 9fec84d4564530bc97b42d56e01a64abb96adac3 /crypto/evp/bio_enc.c | |
parent | cd4f7cddc7994d23d48b86cf638541c6e2310c2d (diff) | |
download | openssl-b6dcdbfc94c482f6c15ba725754fc9e827e41851.tar.gz |
Audit libcrypto for unchecked return values: fix all cases enountered
Diffstat (limited to 'crypto/evp/bio_enc.c')
-rw-r--r-- | crypto/evp/bio_enc.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c index f6ac94c6e1..afb4d319ce 100644 --- a/crypto/evp/bio_enc.c +++ b/crypto/evp/bio_enc.c @@ -198,9 +198,13 @@ static int enc_read(BIO *b, char *out, int outl) } else { - EVP_CipherUpdate(&(ctx->cipher), + if (!EVP_CipherUpdate(&(ctx->cipher), (unsigned char *)ctx->buf,&ctx->buf_len, - (unsigned char *)&(ctx->buf[BUF_OFFSET]),i); + (unsigned char *)&(ctx->buf[BUF_OFFSET]),i)) + { + BIO_clear_retry_flags(b); + return 0; + } ctx->cont=1; /* Note: it is possible for EVP_CipherUpdate to * decrypt zero bytes because this is or looks like @@ -257,9 +261,13 @@ static int enc_write(BIO *b, const char *in, int inl) while (inl > 0) { n=(inl > ENC_BLOCK_SIZE)?ENC_BLOCK_SIZE:inl; - EVP_CipherUpdate(&(ctx->cipher), + if (!EVP_CipherUpdate(&(ctx->cipher), (unsigned char *)ctx->buf,&ctx->buf_len, - (unsigned char *)in,n); + (unsigned char *)in,n)) + { + BIO_clear_retry_flags(b); + return 0; + } inl-=n; in+=n; @@ -298,8 +306,9 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_RESET: ctx->ok=1; ctx->finished=0; - EVP_CipherInit_ex(&(ctx->cipher),NULL,NULL,NULL,NULL, - ctx->cipher.encrypt); + if (!EVP_CipherInit_ex(&(ctx->cipher),NULL,NULL,NULL,NULL, + ctx->cipher.encrypt)) + return 0; ret=BIO_ctrl(b->next_bio,cmd,num,ptr); break; case BIO_CTRL_EOF: /* More to read */ @@ -405,22 +414,24 @@ EVP_CIPHER_ctx *c; } */ -void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, +int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, const unsigned char *i, int e) { BIO_ENC_CTX *ctx; - if (b == NULL) return; + if (b == NULL) return 0; if ((b->callback != NULL) && (b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,0L) <= 0)) - return; + return 0; b->init=1; ctx=(BIO_ENC_CTX *)b->ptr; - EVP_CipherInit_ex(&(ctx->cipher),c,NULL, k,i,e); + if (!EVP_CipherInit_ex(&(ctx->cipher),c,NULL, k,i,e)) + return 0; if (b->callback != NULL) - b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,1L); + return b->callback(b,BIO_CB_CTRL,(const char *)c,BIO_CTRL_SET,e,1L); + return 1; } |