diff options
Diffstat (limited to 'src/lib/libcrypto/evp/evp.h')
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index df71b0ac16..012b06befc 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp.h,v 1.96 2022/01/12 08:52:25 tb Exp $ */ | 1 | /* $OpenBSD: evp.h,v 1.97 2022/01/14 07:49:49 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -495,7 +495,6 @@ int EVP_MD_size(const EVP_MD *md); | |||
495 | int EVP_MD_block_size(const EVP_MD *md); | 495 | int EVP_MD_block_size(const EVP_MD *md); |
496 | unsigned long EVP_MD_flags(const EVP_MD *md); | 496 | unsigned long EVP_MD_flags(const EVP_MD *md); |
497 | 497 | ||
498 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_CRYPTO_INTERNAL) | ||
499 | EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type); | 498 | EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type); |
500 | void EVP_MD_meth_free(EVP_MD *md); | 499 | void EVP_MD_meth_free(EVP_MD *md); |
501 | EVP_MD *EVP_MD_meth_dup(const EVP_MD *md); | 500 | EVP_MD *EVP_MD_meth_dup(const EVP_MD *md); |
@@ -513,14 +512,11 @@ int EVP_MD_meth_set_copy(EVP_MD *md, | |||
513 | int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx)); | 512 | int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx)); |
514 | int EVP_MD_meth_set_ctrl(EVP_MD *md, | 513 | int EVP_MD_meth_set_ctrl(EVP_MD *md, |
515 | int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)); | 514 | int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)); |
516 | #endif | ||
517 | 515 | ||
518 | const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx); | 516 | const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx); |
519 | void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx); | 517 | void *EVP_MD_CTX_md_data(const EVP_MD_CTX *ctx); |
520 | #if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
521 | EVP_PKEY_CTX *EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx); | 518 | EVP_PKEY_CTX *EVP_MD_CTX_pkey_ctx(const EVP_MD_CTX *ctx); |
522 | void EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx); | 519 | void EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx); |
523 | #endif | ||
524 | #define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e)) | 520 | #define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e)) |
525 | #define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e)) | 521 | #define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e)) |
526 | #define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e)) | 522 | #define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e)) |
@@ -546,11 +542,9 @@ int EVP_CIPHER_CTX_set_iv(EVP_CIPHER_CTX *ctx, | |||
546 | int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); | 542 | int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); |
547 | void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx); | 543 | void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx); |
548 | void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data); | 544 | void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data); |
549 | #if defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_CRYPTO_INTERNAL) | ||
550 | void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx); | 545 | void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx); |
551 | void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); | 546 | void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data); |
552 | unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx); | 547 | unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx); |
553 | #endif | ||
554 | #define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c)) | 548 | #define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c)) |
555 | unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx); | 549 | unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx); |
556 | #define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE) | 550 | #define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE) |
@@ -1107,14 +1101,12 @@ void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth, | |||
1107 | void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, | 1101 | void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth, |
1108 | int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2)); | 1102 | int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2)); |
1109 | 1103 | ||
1110 | #if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
1111 | void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, | 1104 | void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth, |
1112 | int (*pkey_check)(const EVP_PKEY *pk)); | 1105 | int (*pkey_check)(const EVP_PKEY *pk)); |
1113 | void EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, | 1106 | void EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth, |
1114 | int (*pkey_public_check)(const EVP_PKEY *pk)); | 1107 | int (*pkey_public_check)(const EVP_PKEY *pk)); |
1115 | void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | 1108 | void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, |
1116 | int (*pkey_check)(const EVP_PKEY *pk)); | 1109 | int (*pkey_check)(const EVP_PKEY *pk)); |
1117 | #endif | ||
1118 | 1110 | ||
1119 | #define EVP_PKEY_OP_UNDEFINED 0 | 1111 | #define EVP_PKEY_OP_UNDEFINED 0 |
1120 | #define EVP_PKEY_OP_PARAMGEN (1<<1) | 1112 | #define EVP_PKEY_OP_PARAMGEN (1<<1) |
@@ -1242,11 +1234,9 @@ int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx); | |||
1242 | int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey); | 1234 | int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey); |
1243 | int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx); | 1235 | int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx); |
1244 | int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey); | 1236 | int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey); |
1245 | #if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
1246 | int EVP_PKEY_check(EVP_PKEY_CTX *ctx); | 1237 | int EVP_PKEY_check(EVP_PKEY_CTX *ctx); |
1247 | int EVP_PKEY_public_check(EVP_PKEY_CTX *ctx); | 1238 | int EVP_PKEY_public_check(EVP_PKEY_CTX *ctx); |
1248 | int EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); | 1239 | int EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); |
1249 | #endif | ||
1250 | 1240 | ||
1251 | void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb); | 1241 | void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb); |
1252 | EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx); | 1242 | EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx); |
@@ -1313,14 +1303,12 @@ void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, | |||
1313 | int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2), | 1303 | int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2), |
1314 | int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value)); | 1304 | int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value)); |
1315 | 1305 | ||
1316 | #if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
1317 | void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, | 1306 | void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, |
1318 | int (*check)(EVP_PKEY *pkey)); | 1307 | int (*check)(EVP_PKEY *pkey)); |
1319 | void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, | 1308 | void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, |
1320 | int (*public_check)(EVP_PKEY *pkey)); | 1309 | int (*public_check)(EVP_PKEY *pkey)); |
1321 | void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, | 1310 | void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, |
1322 | int (*param_check)(EVP_PKEY *pkey)); | 1311 | int (*param_check)(EVP_PKEY *pkey)); |
1323 | #endif | ||
1324 | 1312 | ||
1325 | /* Authenticated Encryption with Additional Data. | 1313 | /* Authenticated Encryption with Additional Data. |
1326 | * | 1314 | * |
@@ -1378,7 +1366,6 @@ typedef struct evp_aead_ctx_st { | |||
1378 | * should be used. */ | 1366 | * should be used. */ |
1379 | #define EVP_AEAD_DEFAULT_TAG_LENGTH 0 | 1367 | #define EVP_AEAD_DEFAULT_TAG_LENGTH 0 |
1380 | 1368 | ||
1381 | #if defined(LIBRESSL_CRYPTO_INTERNAL) || defined(LIBRESSL_NEXT_API) | ||
1382 | /* EVP_AEAD_CTX_new allocates a new context for use with EVP_AEAD_CTX_init. | 1369 | /* EVP_AEAD_CTX_new allocates a new context for use with EVP_AEAD_CTX_init. |
1383 | * It can be cleaned up for reuse with EVP_AEAD_CTX_cleanup and must be freed | 1370 | * It can be cleaned up for reuse with EVP_AEAD_CTX_cleanup and must be freed |
1384 | * with EVP_AEAD_CTX_free. */ | 1371 | * with EVP_AEAD_CTX_free. */ |
@@ -1386,7 +1373,6 @@ EVP_AEAD_CTX *EVP_AEAD_CTX_new(void); | |||
1386 | 1373 | ||
1387 | /* EVP_AEAD_CTX_free releases all memory owned by the context. */ | 1374 | /* EVP_AEAD_CTX_free releases all memory owned by the context. */ |
1388 | void EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx); | 1375 | void EVP_AEAD_CTX_free(EVP_AEAD_CTX *ctx); |
1389 | #endif | ||
1390 | 1376 | ||
1391 | /* EVP_AEAD_CTX_init initializes the context for the given AEAD algorithm. | 1377 | /* EVP_AEAD_CTX_init initializes the context for the given AEAD algorithm. |
1392 | * The implementation argument may be NULL to choose the default implementation. | 1378 | * The implementation argument may be NULL to choose the default implementation. |