diff options
author | Matt Caswell <matt@openssl.org> | 2016-03-22 09:21:29 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-03-29 17:40:54 +0100 |
commit | a146ae55ba479a5c7aa2a6afba1b2b93102a152c (patch) | |
tree | 4c0803ebfed56f2a4ff59725a763cdc78bcf0379 /crypto/evp/bio_md.c | |
parent | f334461facc4078adbad6552563f77799c174cab (diff) |
Make BIO opaque
Move the the BIO_METHOD and BIO structures into internal header files,
provide appropriate accessor methods and update all internal code to use
the new accessors where appropriate.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/evp/bio_md.c')
-rw-r--r-- | crypto/evp/bio_md.c | 100 |
1 files changed, 53 insertions, 47 deletions
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 90dffa1313..46c5583351 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -62,6 +62,7 @@ #include <openssl/evp.h> #include "internal/evp_int.h" #include "evp_locl.h" +#include "internal/bio.h" /* * BIO_put and BIO_get both add to the digest, BIO_gets returns the digest @@ -103,37 +104,40 @@ static int md_new(BIO *bi) if (ctx == NULL) return (0); - bi->init = 0; - bi->ptr = (char *)ctx; - bi->flags = 0; - return (1); + BIO_set_init(bi, 1); + BIO_set_data(bi, ctx); + + return 1; } static int md_free(BIO *a) { if (a == NULL) return (0); - EVP_MD_CTX_free(a->ptr); - a->ptr = NULL; - a->init = 0; - a->flags = 0; - return (1); + EVP_MD_CTX_free(BIO_get_data(a)); + BIO_set_data(a, NULL); + BIO_set_init(a, 0); + + return 1; } static int md_read(BIO *b, char *out, int outl) { int ret = 0; EVP_MD_CTX *ctx; + BIO *next; if (out == NULL) return (0); - ctx = b->ptr; - if ((ctx == NULL) || (b->next_bio == NULL)) + ctx = BIO_get_data(b); + next = BIO_next(b); + + if ((ctx == NULL) || (next == NULL)) return (0); - ret = BIO_read(b->next_bio, out, outl); - if (b->init) { + ret = BIO_read(next, out, outl); + if (BIO_get_init(b)) { if (ret > 0) { if (EVP_DigestUpdate(ctx, (unsigned char *)out, (unsigned int)ret) <= 0) @@ -149,14 +153,17 @@ static int md_write(BIO *b, const char *in, int inl) { int ret = 0; EVP_MD_CTX *ctx; + BIO *next; if ((in == NULL) || (inl <= 0)) - return (0); - ctx = b->ptr; + return 0; - if ((ctx != NULL) && (b->next_bio != NULL)) - ret = BIO_write(b->next_bio, in, inl); - if (b->init) { + ctx = BIO_get_data(b); + next = BIO_next(b); + if ((ctx != NULL) && (next != NULL)) + ret = BIO_write(next, in, inl); + + if (BIO_get_init(b)) { if (ret > 0) { if (!EVP_DigestUpdate(ctx, (const unsigned char *)in, (unsigned int)ret)) { @@ -165,11 +172,11 @@ static int md_write(BIO *b, const char *in, int inl) } } } - if (b->next_bio != NULL) { + if (next != NULL) { BIO_clear_retry_flags(b); BIO_copy_next_retry(b); } - return (ret); + return ret; } static long md_ctrl(BIO *b, int cmd, long num, void *ptr) @@ -178,21 +185,23 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) const EVP_MD **ppmd; EVP_MD *md; long ret = 1; - BIO *dbio; + BIO *dbio, *next; - ctx = b->ptr; + + ctx = BIO_get_data(b); + next = BIO_next(b); switch (cmd) { case BIO_CTRL_RESET: - if (b->init) + if (BIO_get_init(b)) ret = EVP_DigestInit_ex(ctx, ctx->digest, NULL); else ret = 0; if (ret > 0) - ret = BIO_ctrl(b->next_bio, cmd, num, ptr); + ret = BIO_ctrl(next, cmd, num, ptr); break; case BIO_C_GET_MD: - if (b->init) { + if (BIO_get_init(b)) { ppmd = ptr; *ppmd = ctx->digest; } else @@ -201,17 +210,17 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_C_GET_MD_CTX: pctx = ptr; *pctx = ctx; - b->init = 1; + BIO_set_init(b, 1); break; case BIO_C_SET_MD_CTX: - if (b->init) - b->ptr = ptr; + if (BIO_get_init(b)) + BIO_set_data(b, ptr); else ret = 0; break; case BIO_C_DO_STATE_MACHINE: BIO_clear_retry_flags(b); - ret = BIO_ctrl(b->next_bio, cmd, num, ptr); + ret = BIO_ctrl(next, cmd, num, ptr); BIO_copy_next_retry(b); break; @@ -219,17 +228,17 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) md = ptr; ret = EVP_DigestInit_ex(ctx, md, NULL); if (ret > 0) - b->init = 1; + BIO_set_init(b, 1); break; case BIO_CTRL_DUP: dbio = ptr; - dctx = dbio->ptr; + dctx = BIO_get_data(dbio); if (!EVP_MD_CTX_copy_ex(dctx, ctx)) return 0; - b->init = 1; + BIO_set_init(b, 1); break; default: - ret = BIO_ctrl(b->next_bio, cmd, num, ptr); + ret = BIO_ctrl(next, cmd, num, ptr); break; } return (ret); @@ -238,12 +247,16 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr) static long md_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) { long ret = 1; + BIO *next; + + next = BIO_next(b); + + if (next == NULL) + return 0; - if (b->next_bio == NULL) - return (0); switch (cmd) { default: - ret = BIO_callback_ctrl(b->next_bio, cmd, fp); + ret = BIO_callback_ctrl(next, cmd, fp); break; } return (ret); @@ -254,20 +267,13 @@ static int md_gets(BIO *bp, char *buf, int size) EVP_MD_CTX *ctx; unsigned int ret; - ctx = bp->ptr; + ctx = BIO_get_data(bp); + if (size < ctx->digest->md_size) - return (0); + return 0; + if (EVP_DigestFinal_ex(ctx, (unsigned char *)buf, &ret) <= 0) return -1; return ((int)ret); } - -/*- -static int md_puts(bp,str) -BIO *bp; -char *str; - { - return(-1); - } -*/ |