diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-15 15:27:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-15 15:27:03 +0000 |
| commit | e5fa864f62c096536d700d977a5eb924ad293304 (patch) | |
| tree | f97991450654a74c8f8ace4ea11e88a1c055818f /engines | |
| parent | 22c98d4aad76f39ab19e5b63e1448c7d28ca7617 (diff) | |
| download | openssl-e5fa864f62c096536d700d977a5eb924ad293304.zip openssl-e5fa864f62c096536d700d977a5eb924ad293304.tar.gz openssl-e5fa864f62c096536d700d977a5eb924ad293304.tar.bz2 | |
Updates from 1.0.0-stable.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/ccgost/e_gost_err.c | 1 | ||||
| -rw-r--r-- | engines/ccgost/e_gost_err.h | 1 | ||||
| -rw-r--r-- | engines/ccgost/gost_crypt.c | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/engines/ccgost/e_gost_err.c b/engines/ccgost/e_gost_err.c index 4d2b091..4690270 100644 --- a/engines/ccgost/e_gost_err.c +++ b/engines/ccgost/e_gost_err.c @@ -86,6 +86,7 @@ static ERR_STRING_DATA GOST_str_functs[]= {ERR_FUNC(GOST_F_GOST_DO_SIGN), "GOST_DO_SIGN"}, {ERR_FUNC(GOST_F_GOST_DO_VERIFY), "GOST_DO_VERIFY"}, {ERR_FUNC(GOST_F_GOST_IMIT_CTRL), "GOST_IMIT_CTRL"}, +{ERR_FUNC(GOST_F_GOST_IMIT_FINAL), "GOST_IMIT_FINAL"}, {ERR_FUNC(GOST_F_GOST_IMIT_UPDATE), "GOST_IMIT_UPDATE"}, {ERR_FUNC(GOST_F_PARAM_COPY_GOST01), "PARAM_COPY_GOST01"}, {ERR_FUNC(GOST_F_PARAM_COPY_GOST94), "PARAM_COPY_GOST94"}, diff --git a/engines/ccgost/e_gost_err.h b/engines/ccgost/e_gost_err.h index 14326e0..652d1bb 100644 --- a/engines/ccgost/e_gost_err.h +++ b/engines/ccgost/e_gost_err.h @@ -87,6 +87,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line); #define GOST_F_GOST_DO_SIGN 112 #define GOST_F_GOST_DO_VERIFY 113 #define GOST_F_GOST_IMIT_CTRL 114 +#define GOST_F_GOST_IMIT_FINAL 140 #define GOST_F_GOST_IMIT_UPDATE 115 #define GOST_F_PARAM_COPY_GOST01 116 #define GOST_F_PARAM_COPY_GOST94 117 diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c index a9536dd..954d150 100644 --- a/engines/ccgost/gost_crypt.c +++ b/engines/ccgost/gost_crypt.c @@ -550,7 +550,10 @@ int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count) int gost_imit_final(EVP_MD_CTX *ctx,unsigned char *md) { struct ossl_gost_imit_ctx *c = ctx->md_data; - if (!c->key_set) return 0; + if (!c->key_set) { + GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET); + return 0; + } if (c->bytes_left) { int i; |