# include <openssl/opensslconf.h>
# include <openssl/ossl_typ.h>
+# include <openssl/core.h>
# include <openssl/symhacks.h>
# include <openssl/bio.h>
# include <openssl/evperr.h>
/* MAC stuff */
-# define EVP_MAC_BLAKE2B NID_blake2bmac
-# define EVP_MAC_BLAKE2S NID_blake2smac
-# define EVP_MAC_CMAC NID_cmac
-# define EVP_MAC_GMAC NID_gmac
-# define EVP_MAC_HMAC NID_hmac
-# define EVP_MAC_KMAC128 NID_kmac128
-# define EVP_MAC_KMAC256 NID_kmac256
-# define EVP_MAC_SIPHASH NID_siphash
-# define EVP_MAC_POLY1305 NID_poly1305
-
-EVP_MAC_CTX *EVP_MAC_CTX_new(const EVP_MAC *mac);
-EVP_MAC_CTX *EVP_MAC_CTX_new_id(int nid);
+EVP_MAC *EVP_MAC_fetch(OPENSSL_CTX *libctx, const char *algorithm,
+ const char *properties);
+int EVP_MAC_up_ref(EVP_MAC *mac);
+void EVP_MAC_free(EVP_MAC *mac);
+const char *EVP_MAC_name(const EVP_MAC *mac);
+int EVP_MAC_get_params(EVP_MAC *mac, OSSL_PARAM params[]);
+
+EVP_MAC_CTX *EVP_MAC_CTX_new(EVP_MAC *mac);
void EVP_MAC_CTX_free(EVP_MAC_CTX *ctx);
EVP_MAC_CTX *EVP_MAC_CTX_dup(const EVP_MAC_CTX *src);
-const EVP_MAC *EVP_MAC_CTX_mac(EVP_MAC_CTX *ctx);
+EVP_MAC *EVP_MAC_CTX_mac(EVP_MAC_CTX *ctx);
+int EVP_MAC_CTX_get_params(EVP_MAC_CTX *ctx, OSSL_PARAM params[]);
+int EVP_MAC_CTX_set_params(EVP_MAC_CTX *ctx, const OSSL_PARAM params[]);
+
size_t EVP_MAC_size(EVP_MAC_CTX *ctx);
int EVP_MAC_init(EVP_MAC_CTX *ctx);
int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen);
-int EVP_MAC_final(EVP_MAC_CTX *ctx, unsigned char *out, size_t *poutlen);
-int EVP_MAC_ctrl(EVP_MAC_CTX *ctx, int cmd, ...);
-int EVP_MAC_vctrl(EVP_MAC_CTX *ctx, int cmd, va_list args);
-int EVP_MAC_ctrl_str(EVP_MAC_CTX *ctx, const char *type, const char *value);
-int EVP_MAC_str2ctrl(EVP_MAC_CTX *ctx, int cmd, const char *value);
-int EVP_MAC_hex2ctrl(EVP_MAC_CTX *ctx, int cmd, const char *value);
-int EVP_MAC_nid(const EVP_MAC *mac);
-
-# define EVP_get_macbynid(a) EVP_get_macbyname(OBJ_nid2sn(a))
-# define EVP_get_macbyobj(a) EVP_get_macbynid(OBJ_obj2nid(a))
-# define EVP_MAC_name(o) OBJ_nid2sn(EVP_MAC_nid(o))
-const EVP_MAC *EVP_get_macbyname(const char *name);
-void EVP_MAC_do_all(void (*fn)
- (const EVP_MAC *ciph, const char *from, const char *to,
- void *x), void *arg);
-void EVP_MAC_do_all_sorted(void (*fn)
- (const EVP_MAC *ciph, const char *from,
- const char *to, void *x), void *arg);
-
-# define EVP_MAC_CTRL_SET_KEY 0x01 /* unsigned char *, size_t */
-# define EVP_MAC_CTRL_SET_FLAGS 0x02 /* unsigned long */
-# define EVP_MAC_CTRL_SET_ENGINE 0x03 /* ENGINE * */
-# define EVP_MAC_CTRL_SET_MD 0x04 /* EVP_MD * */
-# define EVP_MAC_CTRL_SET_CIPHER 0x05 /* EVP_CIPHER * */
-# define EVP_MAC_CTRL_SET_SIZE 0x06 /* size_t */
-# define EVP_MAC_CTRL_SET_IV 0x07 /* unsigned char *, size_t */
-# define EVP_MAC_CTRL_SET_CUSTOM 0x08 /* unsigned char *, size_t */
-# define EVP_MAC_CTRL_SET_XOF 0x09 /* int */
-# define EVP_MAC_CTRL_SET_SALT 0x0a /* unsigned char *, size_t */
+int EVP_MAC_final(EVP_MAC_CTX *ctx,
+ unsigned char *out, size_t *outl, size_t outsize);
+const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);
+const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac);
+const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac);
/* PKEY stuff */
int EVP_PKEY_decrypt_old(unsigned char *dec_key,