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 4543d4d96a0cd3858d9a64b5293b563c44153cd7..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(ctx,ctx->digest
);
+
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,13
+209,14
@@
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(ctx,md);
- 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(dctx,ctx);
+ EVP_MD_CTX_copy
_ex
(dctx,ctx);
b->init=1;
break;
default:
b->init=1;
break;
default:
@@
-246,7
+249,7
@@
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(ctx,(unsigned char *)buf,&ret);
+ EVP_DigestFinal
_ex
(ctx,(unsigned char *)buf,&ret);
return((int)ret);
}
return((int)ret);
}