diff options
| author | Ben Laurie <ben@openssl.org> | 2001-07-31 01:57:25 +0200 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2001-07-31 01:57:25 +0200 |
| commit | dbad169019598981174ff46c7a9bf58373b0e53a (patch) | |
| tree | ce8ca1188d5614648f24b03967785543f1edc8f5 /crypto/evp/bio_md.c | |
| parent | Make EVPs allocate context memory, thus making them extensible. Rationalise (diff) | |
| download | openssl-dbad169019598981174ff46c7a9bf58373b0e53a.tar.xz openssl-dbad169019598981174ff46c7a9bf58373b0e53a.zip | |
Really add the EVP and all of the DES changes.
Diffstat (limited to 'crypto/evp/bio_md.c')
| -rw-r--r-- | crypto/evp/bio_md.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 2373c247d8..4543d4d96a 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -96,7 +96,7 @@ static int md_new(BIO *bi) { EVP_MD_CTX *ctx; - ctx=(EVP_MD_CTX *)OPENSSL_malloc(sizeof(EVP_MD_CTX)); + ctx=EVP_MD_CTX_create(); if (ctx == NULL) return(0); bi->init=0; @@ -108,7 +108,7 @@ static int md_new(BIO *bi) static int md_free(BIO *a) { if (a == NULL) return(0); - OPENSSL_free(a->ptr); + EVP_MD_CTX_destroy(a->ptr); a->ptr=NULL; a->init=0; a->flags=0; @@ -121,7 +121,7 @@ static int md_read(BIO *b, char *out, int outl) EVP_MD_CTX *ctx; if (out == NULL) return(0); - ctx=(EVP_MD_CTX *)b->ptr; + ctx=b->ptr; if ((ctx == NULL) || (b->next_bio == NULL)) return(0); @@ -145,7 +145,7 @@ static int md_write(BIO *b, const char *in, int inl) EVP_MD_CTX *ctx; if ((in == NULL) || (inl <= 0)) return(0); - ctx=(EVP_MD_CTX *)b->ptr; + ctx=b->ptr; if ((ctx != NULL) && (b->next_bio != NULL)) ret=BIO_write(b->next_bio,in,inl); @@ -170,7 +170,7 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) long ret=1; BIO *dbio; - ctx=(EVP_MD_CTX *)b->ptr; + ctx=b->ptr; switch (cmd) { @@ -184,7 +184,7 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_C_GET_MD: if (b->init) { - ppmd=(const EVP_MD **)ptr; + ppmd=ptr; *ppmd=ctx->digest; } else @@ -193,7 +193,7 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_C_GET_MD_CTX: if (b->init) { - pctx=(EVP_MD_CTX **)ptr; + pctx=ptr; *pctx=ctx; } else @@ -206,14 +206,14 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) break; case BIO_C_SET_MD: - md=(EVP_MD *)ptr; + md=ptr; EVP_DigestInit(ctx,md); b->init=1; break; case BIO_CTRL_DUP: - dbio=(BIO *)ptr; - dctx=(EVP_MD_CTX *)dbio->ptr; - memcpy(dctx,ctx,sizeof(ctx)); + dbio=ptr; + dctx=dbio->ptr; + EVP_MD_CTX_copy(dctx,ctx); b->init=1; break; default: @@ -243,7 +243,7 @@ static int md_gets(BIO *bp, char *buf, int size) unsigned int ret; - ctx=(EVP_MD_CTX *)bp->ptr; + ctx=bp->ptr; if (size < ctx->digest->md_size) return(0); EVP_DigestFinal(ctx,(unsigned char *)buf,&ret); |