projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
evp/e_aes_cbc_hmac_sha*.c: improve cache locality.
[oweals/openssl.git]
/
crypto
/
evp
/
bio_md.c
diff --git
a/crypto/evp/bio_md.c
b/crypto/evp/bio_md.c
index c632dfb20227fec1d6d4bc22dd35267a0b10bd88..144fdfd56a0ec047d9ccd41bae96ba04ed3ea94e 100644
(file)
--- a/
crypto/evp/bio_md.c
+++ b/
crypto/evp/bio_md.c
@@
-130,8
+130,8
@@
static int md_read(BIO *b, char *out, int outl)
{
if (ret > 0)
{
{
if (ret > 0)
{
- EVP_DigestUpdate(ctx,(unsigned char *)out,
- (unsigned int)ret);
+
if (
EVP_DigestUpdate(ctx,(unsigned char *)out,
+ (unsigned int)ret)
<=0) return (-1)
;
}
}
BIO_clear_retry_flags(b);
}
}
BIO_clear_retry_flags(b);
@@
-153,12
+153,19
@@
static int md_write(BIO *b, const char *in, int inl)
{
if (ret > 0)
{
{
if (ret > 0)
{
- EVP_DigestUpdate(ctx,(unsigned char *)in,
- (unsigned int)ret);
+ if (!EVP_DigestUpdate(ctx,(const unsigned char *)in,
+ (unsigned int)ret))
+ {
+ BIO_clear_retry_flags(b);
+ return 0;
+ }
}
}
}
}
- BIO_clear_retry_flags(b);
- BIO_copy_next_retry(b);
+ if(b->next_bio != NULL)
+ {
+ BIO_clear_retry_flags(b);
+ BIO_copy_next_retry(b);
+ }
return(ret);
}
return(ret);
}
@@
-176,10
+183,11
@@
static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
{
case BIO_CTRL_RESET:
if (b->init)
{
case BIO_CTRL_RESET:
if (b->init)
- EVP_DigestInit_ex(ctx,ctx->digest, NULL);
+
ret =
EVP_DigestInit_ex(ctx,ctx->digest, NULL);
else
ret=0;
else
ret=0;
- ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
+ if (ret > 0)
+ ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
break;
case BIO_C_GET_MD:
if (b->init)
break;
case BIO_C_GET_MD:
if (b->init)
@@
-191,11
+199,13
@@
static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
ret=0;
break;
case BIO_C_GET_MD_CTX:
ret=0;
break;
case BIO_C_GET_MD_CTX:
+ pctx=ptr;
+ *pctx=ctx;
+ b->init = 1;
+ break;
+ case BIO_C_SET_MD_CTX:
if (b->init)
if (b->init)
- {
- pctx=ptr;
- *pctx=ctx;
- }
+ b->ptr=ptr;
else
ret=0;
break;
else
ret=0;
break;
@@
-207,13
+217,15
@@
static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_C_SET_MD:
md=ptr;
case BIO_C_SET_MD:
md=ptr;
- EVP_DigestInit_ex(ctx,md, NULL);
- b->init=1;
+ ret = EVP_DigestInit_ex(ctx,md, NULL);
+ if (ret > 0)
+ b->init=1;
break;
case BIO_CTRL_DUP:
dbio=ptr;
dctx=dbio->ptr;
break;
case BIO_CTRL_DUP:
dbio=ptr;
dctx=dbio->ptr;
- EVP_MD_CTX_copy_ex(dctx,ctx);
+ if (!EVP_MD_CTX_copy_ex(dctx,ctx))
+ return 0;
b->init=1;
break;
default:
b->init=1;
break;
default:
@@
-246,7
+258,9
@@
static int md_gets(BIO *bp, char *buf, int size)
ctx=bp->ptr;
if (size < ctx->digest->md_size)
return(0);
ctx=bp->ptr;
if (size < ctx->digest->md_size)
return(0);
- EVP_DigestFinal_ex(ctx,(unsigned char *)buf,&ret);
+ if (EVP_DigestFinal_ex(ctx,(unsigned char *)buf,&ret)<=0)
+ return -1;
+
return((int)ret);
}
return((int)ret);
}