#include "prov/blake2.h" /* diverse BLAKE2 macros */
#include "legacy_meth.h"
-/*
- * Local hack to adapt the BLAKE2 init functions to what the
- * legacy function signatures demand.
- */
-static int blake2s_init(BLAKE2S_CTX *C)
-{
- BLAKE2S_PARAM P;
-
- ossl_blake2s_param_init(&P);
- return ossl_blake2s_init(C, &P);
-}
-static int blake2b_init(BLAKE2B_CTX *C)
-{
- BLAKE2B_PARAM P;
-
- ossl_blake2b_param_init(&P);
- return ossl_blake2b_init(C, &P);
-}
-#define blake2s_update ossl_blake2s_update
-#define blake2b_update ossl_blake2b_update
-#define blake2s_final ossl_blake2s_final
-#define blake2b_final ossl_blake2b_final
-
-IMPLEMENT_LEGACY_EVP_MD_METH_LC(blake2s_int, blake2s)
-IMPLEMENT_LEGACY_EVP_MD_METH_LC(blake2b_int, blake2b)
-
static const EVP_MD blake2b_md = {
NID_blake2b512,
0,
BLAKE2B_DIGEST_LENGTH,
0,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(blake2b_int_init, blake2b_int_update,
- blake2b_int_final, NULL, BLAKE2B_BLOCKBYTES),
+ LEGACY_EVP_MD_METH_TABLE(BLAKE2B_BLOCKBYTES),
};
const EVP_MD *EVP_blake2b512(void)
BLAKE2S_DIGEST_LENGTH,
0,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(blake2s_int_init, blake2s_int_update,
- blake2s_int_final, NULL, BLAKE2S_BLOCKBYTES),
+ LEGACY_EVP_MD_METH_TABLE(BLAKE2S_BLOCKBYTES),
};
const EVP_MD *EVP_blake2s256(void)
#include "legacy_meth.h"
#include "evp_local.h"
-/*-
- * LEGACY methods for SHA.
- * These only remain to support engines that can get these methods.
- * Hardware support for SHA3 has been removed from these legacy cases.
- */
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag) \
- static int nm##_init(EVP_MD_CTX *ctx) \
- { \
- return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
- } \
- static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
- { \
- return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count); \
- } \
- static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md) \
- { \
- KECCAK1600_CTX *kctx = EVP_MD_CTX_get0_md_data(ctx); \
- return fn##_final(kctx, md, kctx->md_size); \
- }
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag) \
- static int nm##_init(EVP_MD_CTX *ctx) \
- { \
- return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
- }
-
-#define sha512_224_Init sha512_224_init
-#define sha512_256_Init sha512_256_init
-
-#define sha512_224_Update SHA512_Update
-#define sha512_224_Final SHA512_Final
-#define sha512_256_Update SHA512_Update
-#define sha512_256_Final SHA512_Final
-
-IMPLEMENT_LEGACY_EVP_MD_METH(sha1, SHA1)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha224, SHA224)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha256, SHA256)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha384, SHA384)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha512, SHA512)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha512_224_int, sha512_224)
-IMPLEMENT_LEGACY_EVP_MD_METH(sha512_256_int, sha512_256)
-IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(sha3_int, ossl_sha3, '\x06')
-IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, ossl_sha3, '\x1f')
-
-static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
-{
- return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_get0_md_data(ctx) : NULL,
- cmd, p1, p2);
-}
-
-static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2)
-{
- KECCAK1600_CTX *ctx;
-
- if (evp_ctx == NULL)
- return 0;
- ctx = evp_ctx->md_data;
-
- switch (cmd) {
- case EVP_MD_CTRL_XOF_LEN:
- ctx->md_size = p1;
- return 1;
- default:
- return 0;
- }
-}
-
static const EVP_MD sha1_md = {
NID_sha1,
NID_sha1WithRSAEncryption,
SHA_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha1_init, sha1_update, sha1_final, sha1_int_ctrl,
- SHA_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA_CBLOCK)
};
const EVP_MD *EVP_sha1(void)
SHA224_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha224_init, sha224_update, sha224_final, NULL,
- SHA256_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA256_CBLOCK)
};
const EVP_MD *EVP_sha224(void)
SHA256_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha256_init, sha256_update, sha256_final, NULL,
- SHA256_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA256_CBLOCK)
};
const EVP_MD *EVP_sha256(void)
SHA224_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha512_224_int_init, sha512_224_int_update,
- sha512_224_int_final, NULL, SHA512_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA512_CBLOCK)
};
const EVP_MD *EVP_sha512_224(void)
SHA256_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha512_256_int_init, sha512_256_int_update,
- sha512_256_int_final, NULL, SHA512_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA512_CBLOCK)
};
const EVP_MD *EVP_sha512_256(void)
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha384_init, sha384_update, sha384_final, NULL,
- SHA512_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA512_CBLOCK)
};
const EVP_MD *EVP_sha384(void)
SHA512_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
EVP_ORIG_GLOBAL,
- LEGACY_EVP_MD_METH_TABLE(sha512_init, sha512_update, sha512_final, NULL,
- SHA512_CBLOCK),
+ LEGACY_EVP_MD_METH_TABLE(SHA512_CBLOCK),
};
const EVP_MD *EVP_sha512(void)
return &sha512_md;
}
-#define EVP_MD_SHA3(bitlen) \
- const EVP_MD *EVP_sha3_##bitlen(void) \
- { \
- static const EVP_MD sha3_##bitlen##_md = { \
- NID_sha3_##bitlen, \
- NID_RSA_SHA3_##bitlen, \
- bitlen / 8, \
- EVP_MD_FLAG_DIGALGID_ABSENT, \
- EVP_ORIG_GLOBAL, \
- LEGACY_EVP_MD_METH_TABLE(sha3_int_init, sha3_int_update, \
- sha3_int_final, NULL, \
- (KECCAK1600_WIDTH - bitlen * 2) / 8), \
- }; \
- return &sha3_##bitlen##_md; \
+#define EVP_MD_SHA3(bitlen) \
+ const EVP_MD *EVP_sha3_##bitlen(void) \
+ { \
+ static const EVP_MD sha3_##bitlen##_md = { \
+ NID_sha3_##bitlen, \
+ NID_RSA_SHA3_##bitlen, \
+ bitlen / 8, \
+ EVP_MD_FLAG_DIGALGID_ABSENT, \
+ EVP_ORIG_GLOBAL, \
+ LEGACY_EVP_MD_METH_TABLE((KECCAK1600_WIDTH - bitlen * 2) / 8) \
+ }; \
+ return &sha3_##bitlen##_md; \
}
-#define EVP_MD_SHAKE(bitlen) \
- const EVP_MD *EVP_shake##bitlen(void) \
- { \
- static const EVP_MD shake##bitlen##_md = { \
- NID_shake##bitlen, \
- 0, \
- bitlen / 8, \
- EVP_MD_FLAG_XOF | EVP_MD_FLAG_DIGALGID_ABSENT, \
- EVP_ORIG_GLOBAL, \
- LEGACY_EVP_MD_METH_TABLE(shake_init, sha3_int_update, sha3_int_final, \
- shake_ctrl, (KECCAK1600_WIDTH - bitlen * 2) / 8), \
- }; \
- return &shake##bitlen##_md; \
+#define EVP_MD_SHAKE(bitlen) \
+ const EVP_MD *EVP_shake##bitlen(void) \
+ { \
+ static const EVP_MD shake##bitlen##_md = { \
+ NID_shake##bitlen, \
+ 0, \
+ bitlen / 8, \
+ EVP_MD_FLAG_XOF | EVP_MD_FLAG_DIGALGID_ABSENT, \
+ EVP_ORIG_GLOBAL, \
+ LEGACY_EVP_MD_METH_TABLE((KECCAK1600_WIDTH - bitlen * 2) / 8) \
+ }; \
+ return &shake##bitlen##_md; \
}
EVP_MD_SHA3(224)