projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove MD2 from digest algorithm table. This follows the recommendation in
[oweals/openssl.git]
/
crypto
/
evp
/
bio_md.c
diff --git
a/crypto/evp/bio_md.c
b/crypto/evp/bio_md.c
index c632dfb20227fec1d6d4bc22dd35267a0b10bd88..ed5c1135fd456bf87f5580f542e29d014647b860 100644
(file)
--- a/
crypto/evp/bio_md.c
+++ b/
crypto/evp/bio_md.c
@@
-153,7
+153,7
@@
static int md_write(BIO *b, const char *in, int inl)
{
if (ret > 0)
{
{
if (ret > 0)
{
- EVP_DigestUpdate(ctx,(unsigned char *)in,
+ EVP_DigestUpdate(ctx,(
const
unsigned char *)in,
(unsigned int)ret);
}
}
(unsigned int)ret);
}
}
@@
-176,10
+176,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
+192,12
@@
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;
+ 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,8
+209,9
@@
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;
break;
case BIO_CTRL_DUP:
dbio=ptr;