X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_md.c;h=b8824eb48d5c99f6138c42eed2afc9b72ef41d9b;hb=d47bcf34df615475181a4a11f3fe5560477f3895;hp=e4403098cd4ea9df90994a76c616978d2d6a7ab4;hpb=1d5c8f8d6422049b58dc83e113039e95207edf33;p=openssl-gost%2Fengine.git diff --git a/gost_md.c b/gost_md.c index e440309..b8824eb 100644 --- a/gost_md.c +++ b/gost_md.c @@ -37,7 +37,7 @@ GOST_digest GostR3411_94_digest = { * Note: that you cannot template 0 value. */ #define TPL(st,field) ( \ - ((st)->field) ?: TPL_VAL(st,field) \ + ((st)->field) ? ((st)->field) : TPL_VAL(st,field) \ ) #define TPL_VAL(st,field) ( \ @@ -78,17 +78,7 @@ void GOST_deinit_digest(GOST_digest *d) d->digest = NULL; } -EVP_MD *digest_gost(void) -{ - return GOST_init_digest(&GostR3411_94_digest); -} - -void digest_gost_destroy(void) -{ - GOST_deinit_digest(&GostR3411_94_digest); -} - -int gost_digest_init(EVP_MD_CTX *ctx) +static int gost_digest_init(EVP_MD_CTX *ctx) { struct ossl_gost_digest_ctx *c = EVP_MD_CTX_md_data(ctx); memset(&(c->dctx), 0, sizeof(gost_hash_ctx)); @@ -97,18 +87,18 @@ int gost_digest_init(EVP_MD_CTX *ctx) return 1; } -int gost_digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) +static int gost_digest_update(EVP_MD_CTX *ctx, const void *data, size_t count) { return hash_block((gost_hash_ctx *) EVP_MD_CTX_md_data(ctx), data, count); } -int gost_digest_final(EVP_MD_CTX *ctx, unsigned char *md) +static int gost_digest_final(EVP_MD_CTX *ctx, unsigned char *md) { return finish_hash((gost_hash_ctx *) EVP_MD_CTX_md_data(ctx), md); } -int gost_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) +static int gost_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) { struct ossl_gost_digest_ctx *md_ctx = EVP_MD_CTX_md_data(to); if (EVP_MD_CTX_md_data(to) && EVP_MD_CTX_md_data(from)) { @@ -119,7 +109,7 @@ int gost_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) return 1; } -int gost_digest_cleanup(EVP_MD_CTX *ctx) +static int gost_digest_cleanup(EVP_MD_CTX *ctx) { if (EVP_MD_CTX_md_data(ctx)) memset(EVP_MD_CTX_md_data(ctx), 0,