diff options
Diffstat (limited to 'src/lib/libcrypto/engine/engine.h')
| -rw-r--r-- | src/lib/libcrypto/engine/engine.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 0f603feaaf..dc14be8e38 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: engine.h,v 1.32 2018/11/11 06:41:28 bcook Exp $ */ | 1 | /* $OpenBSD: engine.h,v 1.33 2019/01/19 01:07:00 tb Exp $ */ |
| 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL | 2 | /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -87,6 +87,9 @@ | |||
| 87 | #ifndef OPENSSL_NO_ECDSA | 87 | #ifndef OPENSSL_NO_ECDSA |
| 88 | #include <openssl/ecdsa.h> | 88 | #include <openssl/ecdsa.h> |
| 89 | #endif | 89 | #endif |
| 90 | #ifndef OPENSSL_NO_EC | ||
| 91 | #include <openssl/ec.h> | ||
| 92 | #endif | ||
| 90 | #include <openssl/ui.h> | 93 | #include <openssl/ui.h> |
| 91 | #include <openssl/err.h> | 94 | #include <openssl/err.h> |
| 92 | #endif | 95 | #endif |
| @@ -112,6 +115,7 @@ extern "C" { | |||
| 112 | #define ENGINE_METHOD_STORE (unsigned int)0x0100 | 115 | #define ENGINE_METHOD_STORE (unsigned int)0x0100 |
| 113 | #define ENGINE_METHOD_PKEY_METHS (unsigned int)0x0200 | 116 | #define ENGINE_METHOD_PKEY_METHS (unsigned int)0x0200 |
| 114 | #define ENGINE_METHOD_PKEY_ASN1_METHS (unsigned int)0x0400 | 117 | #define ENGINE_METHOD_PKEY_ASN1_METHS (unsigned int)0x0400 |
| 118 | #define ENGINE_METHOD_EC (unsigned int)0x0800 | ||
| 115 | /* Obvious all-or-nothing cases. */ | 119 | /* Obvious all-or-nothing cases. */ |
| 116 | #define ENGINE_METHOD_ALL (unsigned int)0xFFFF | 120 | #define ENGINE_METHOD_ALL (unsigned int)0xFFFF |
| 117 | #define ENGINE_METHOD_NONE (unsigned int)0x0000 | 121 | #define ENGINE_METHOD_NONE (unsigned int)0x0000 |
| @@ -353,6 +357,10 @@ int ENGINE_register_ECDSA(ENGINE *e); | |||
| 353 | void ENGINE_unregister_ECDSA(ENGINE *e); | 357 | void ENGINE_unregister_ECDSA(ENGINE *e); |
| 354 | void ENGINE_register_all_ECDSA(void); | 358 | void ENGINE_register_all_ECDSA(void); |
| 355 | 359 | ||
| 360 | int ENGINE_register_EC(ENGINE *e); | ||
| 361 | void ENGINE_unregister_EC(ENGINE *e); | ||
| 362 | void ENGINE_register_all_EC(void); | ||
| 363 | |||
| 356 | int ENGINE_register_DH(ENGINE *e); | 364 | int ENGINE_register_DH(ENGINE *e); |
| 357 | void ENGINE_unregister_DH(ENGINE *e); | 365 | void ENGINE_unregister_DH(ENGINE *e); |
| 358 | void ENGINE_register_all_DH(void); | 366 | void ENGINE_register_all_DH(void); |
| @@ -447,6 +455,7 @@ int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); | |||
| 447 | int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); | 455 | int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); |
| 448 | int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth); | 456 | int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth); |
| 449 | int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth); | 457 | int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth); |
| 458 | int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ec_meth); | ||
| 450 | int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); | 459 | int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); |
| 451 | int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); | 460 | int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); |
| 452 | int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth); | 461 | int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth); |
| @@ -486,6 +495,7 @@ const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e); | |||
| 486 | const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); | 495 | const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); |
| 487 | const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e); | 496 | const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e); |
| 488 | const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e); | 497 | const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e); |
| 498 | const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e); | ||
| 489 | const DH_METHOD *ENGINE_get_DH(const ENGINE *e); | 499 | const DH_METHOD *ENGINE_get_DH(const ENGINE *e); |
| 490 | const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e); | 500 | const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e); |
| 491 | const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e); | 501 | const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e); |
| @@ -553,6 +563,7 @@ ENGINE *ENGINE_get_default_RSA(void); | |||
| 553 | ENGINE *ENGINE_get_default_DSA(void); | 563 | ENGINE *ENGINE_get_default_DSA(void); |
| 554 | ENGINE *ENGINE_get_default_ECDH(void); | 564 | ENGINE *ENGINE_get_default_ECDH(void); |
| 555 | ENGINE *ENGINE_get_default_ECDSA(void); | 565 | ENGINE *ENGINE_get_default_ECDSA(void); |
| 566 | ENGINE *ENGINE_get_default_EC(void); | ||
| 556 | ENGINE *ENGINE_get_default_DH(void); | 567 | ENGINE *ENGINE_get_default_DH(void); |
| 557 | ENGINE *ENGINE_get_default_RAND(void); | 568 | ENGINE *ENGINE_get_default_RAND(void); |
| 558 | /* These functions can be used to get a functional reference to perform | 569 | /* These functions can be used to get a functional reference to perform |
| @@ -572,6 +583,7 @@ int ENGINE_set_default_string(ENGINE *e, const char *def_list); | |||
| 572 | int ENGINE_set_default_DSA(ENGINE *e); | 583 | int ENGINE_set_default_DSA(ENGINE *e); |
| 573 | int ENGINE_set_default_ECDH(ENGINE *e); | 584 | int ENGINE_set_default_ECDH(ENGINE *e); |
| 574 | int ENGINE_set_default_ECDSA(ENGINE *e); | 585 | int ENGINE_set_default_ECDSA(ENGINE *e); |
| 586 | int ENGINE_set_default_EC(ENGINE *e); | ||
| 575 | int ENGINE_set_default_DH(ENGINE *e); | 587 | int ENGINE_set_default_DH(ENGINE *e); |
| 576 | int ENGINE_set_default_RAND(ENGINE *e); | 588 | int ENGINE_set_default_RAND(ENGINE *e); |
| 577 | int ENGINE_set_default_ciphers(ENGINE *e); | 589 | int ENGINE_set_default_ciphers(ENGINE *e); |
