diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-22 15:51:49 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-23 17:31:40 +1000 |
| commit | 8dbef010e7e6ecc07a9c8142cf26c8768fd55dc2 (patch) | |
| tree | a3e5ecfc64eed994b7c1c2e185ce45e182332f69 /include/crypto/ecx.h | |
| parent | 7f80980fb7096ab4898e500a054a1bb8cbcaa266 (diff) | |
Fix ecx so that is uses a settable propertyquery
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12944)
Diffstat (limited to 'include/crypto/ecx.h')
| -rw-r--r-- | include/crypto/ecx.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/crypto/ecx.h b/include/crypto/ecx.h index 54ce5f2b7c..72cf5dd843 100644 --- a/include/crypto/ecx.h +++ b/include/crypto/ecx.h @@ -62,6 +62,7 @@ typedef enum { struct ecx_key_st { OPENSSL_CTX *libctx; + char *propq; unsigned int haspubkey:1; unsigned char pubkey[MAX_KEYLEN]; unsigned char *privkey; @@ -74,7 +75,8 @@ struct ecx_key_st { typedef struct ecx_key_st ECX_KEY; size_t ecx_key_length(ECX_KEY_TYPE type); -ECX_KEY *ecx_key_new(OPENSSL_CTX *libctx, ECX_KEY_TYPE type, int haspubkey); +ECX_KEY *ecx_key_new(OPENSSL_CTX *libctx, ECX_KEY_TYPE type, int haspubkey, + const char *propq); unsigned char *ecx_key_allocate_privkey(ECX_KEY *key); void ecx_key_free(ECX_KEY *key); int ecx_key_up_ref(ECX_KEY *key); @@ -85,7 +87,7 @@ void X25519_public_from_private(uint8_t out_public_value[32], const uint8_t private_key[32]); int ED25519_public_from_private(OPENSSL_CTX *ctx, uint8_t out_public_key[32], - const uint8_t private_key[32]); + const uint8_t private_key[32], const char *propq); int ED25519_sign(uint8_t *out_sig, const uint8_t *message, size_t message_len, const uint8_t public_key[32], const uint8_t private_key[32], OPENSSL_CTX *libctx, const char *propq); @@ -94,15 +96,15 @@ int ED25519_verify(const uint8_t *message, size_t message_len, OPENSSL_CTX *libctx, const char *propq); int ED448_public_from_private(OPENSSL_CTX *ctx, uint8_t out_public_key[57], - const uint8_t private_key[57]); + const uint8_t private_key[57], const char *propq); int ED448_sign(OPENSSL_CTX *ctx, uint8_t *out_sig, const uint8_t *message, size_t message_len, const uint8_t public_key[57], const uint8_t private_key[57], const uint8_t *context, - size_t context_len); + size_t context_len, const char *propq); int ED448_verify(OPENSSL_CTX *ctx, const uint8_t *message, size_t message_len, const uint8_t signature[114], const uint8_t public_key[57], - const uint8_t *context, size_t context_len); + const uint8_t *context, size_t context_len, const char *propq); int X448(uint8_t out_shared_key[56], const uint8_t private_key[56], const uint8_t peer_public_value[56]); |