|
@@ -8,6 +8,7 @@
|
|
|
*/
|
|
|
|
|
|
#include <openssl/crypto.h>
|
|
|
+#include <openssl/proverr.h>
|
|
|
#include "prov/blake2.h"
|
|
|
#include "prov/digestcommon.h"
|
|
|
#include "prov/implementations.h"
|
|
@@ -83,14 +84,23 @@ static int blake2b512_internal_final(void *ctx, unsigned char *out,
|
|
|
size_t *outl, size_t outsz)
|
|
|
{
|
|
|
struct blake2b_md_data_st *b_ctx;
|
|
|
-
|
|
|
+
|
|
|
b_ctx = (struct blake2b_md_data_st *)ctx;
|
|
|
- *outl = b_ctx->ctx.outlen;
|
|
|
|
|
|
if (!ossl_prov_is_running())
|
|
|
return 0;
|
|
|
|
|
|
- return (outsz > 0) ? ossl_blake2b_final(out, ctx) : 1;
|
|
|
+ *outl = b_ctx->ctx.outlen;
|
|
|
+
|
|
|
+ if (outsz == 0)
|
|
|
+ return 1;
|
|
|
+
|
|
|
+ if (outsz < *outl) {
|
|
|
+ ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_SIZE);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ return ossl_blake2b_final(out, ctx);
|
|
|
}
|
|
|
|
|
|
static int blake2b512_get_params(OSSL_PARAM params[])
|
|
@@ -98,8 +108,8 @@ static int blake2b512_get_params(OSSL_PARAM params[])
|
|
|
return ossl_digest_default_get_params(params, BLAKE2B_BLOCKBYTES, 64, 0);
|
|
|
}
|
|
|
|
|
|
-const OSSL_DISPATCH ossl_blake2b512_functions[] =
|
|
|
- { {OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))blake2b512_newctx},
|
|
|
+const OSSL_DISPATCH ossl_blake2b512_functions[] = {
|
|
|
+ {OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))blake2b512_newctx},
|
|
|
{OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))ossl_blake2b_update},
|
|
|
{OSSL_FUNC_DIGEST_FINAL, (void (*)(void))blake2b512_internal_final},
|
|
|
{OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))blake2b512_freectx},
|
|
@@ -108,8 +118,13 @@ const OSSL_DISPATCH ossl_blake2b512_functions[] =
|
|
|
{OSSL_FUNC_DIGEST_GETTABLE_PARAMS,
|
|
|
(void (*)(void))ossl_digest_default_gettable_params},
|
|
|
{OSSL_FUNC_DIGEST_INIT, (void (*)(void))blake2b512_internal_init},
|
|
|
+ {OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS,
|
|
|
+ (void (*)(void))ossl_blake2b_gettable_ctx_params},
|
|
|
{OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS,
|
|
|
(void (*)(void))ossl_blake2b_settable_ctx_params},
|
|
|
+ {OSSL_FUNC_DIGEST_GET_CTX_PARAMS,
|
|
|
+ (void (*)(void))ossl_blake2b_get_ctx_params},
|
|
|
{OSSL_FUNC_DIGEST_SET_CTX_PARAMS,
|
|
|
- (void (*)(void))ossl_blake2b_set_ctx_params}, {0, NULL} };
|
|
|
-
|
|
|
+ (void (*)(void))ossl_blake2b_set_ctx_params},
|
|
|
+ {0, NULL}
|
|
|
+};
|