Browse Source

gettables: provider changes to pass the provider context.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12581)
master
Pauli 2 years ago
parent
commit
af5e1e852d
54 changed files with 122 additions and 99 deletions
  1. +2
    -2
      providers/implementations/asymciphers/rsa_enc.c
  2. +2
    -2
      providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
  3. +4
    -3
      providers/implementations/ciphers/cipher_aes_ocb.c
  4. +17
    -3
      providers/implementations/ciphers/cipher_aes_siv.c
  5. +1
    -1
      providers/implementations/ciphers/cipher_aes_xts.c
  6. +2
    -2
      providers/implementations/ciphers/cipher_chacha20.c
  7. +1
    -1
      providers/implementations/ciphers/cipher_chacha20_poly1305.c
  8. +2
    -2
      providers/implementations/ciphers/cipher_null.c
  9. +2
    -2
      providers/implementations/ciphers/cipher_rc4_hmac_md5.c
  10. +3
    -3
      providers/implementations/ciphers/ciphercommon.c
  11. +1
    -1
      providers/implementations/digests/digestcommon.c
  12. +1
    -1
      providers/implementations/digests/md5_sha1_prov.c
  13. +1
    -1
      providers/implementations/digests/mdc2_prov.c
  14. +1
    -1
      providers/implementations/digests/sha2_prov.c
  15. +1
    -1
      providers/implementations/digests/sha3_prov.c
  16. +1
    -1
      providers/implementations/exchange/dh_exch.c
  17. +2
    -2
      providers/implementations/exchange/ecdh_exch.c
  18. +2
    -2
      providers/implementations/include/prov/ciphercommon.h
  19. +1
    -1
      providers/implementations/include/prov/digestcommon.h
  20. +2
    -2
      providers/implementations/kdfs/hkdf.c
  21. +4
    -2
      providers/implementations/kdfs/kbkdf.c
  22. +2
    -2
      providers/implementations/kdfs/krb5kdf.c
  23. +4
    -2
      providers/implementations/kdfs/pbkdf2.c
  24. +4
    -2
      providers/implementations/kdfs/scrypt.c
  25. +2
    -2
      providers/implementations/kdfs/sshkdf.c
  26. +2
    -2
      providers/implementations/kdfs/sskdf.c
  27. +4
    -2
      providers/implementations/kdfs/tls1_prf.c
  28. +2
    -2
      providers/implementations/kdfs/x942kdf.c
  29. +2
    -2
      providers/implementations/keymgmt/dh_kmgmt.c
  30. +1
    -1
      providers/implementations/keymgmt/dsa_kmgmt.c
  31. +2
    -2
      providers/implementations/keymgmt/ec_kmgmt.c
  32. +8
    -8
      providers/implementations/keymgmt/ecx_kmgmt.c
  33. +1
    -1
      providers/implementations/keymgmt/rsa_kmgmt.c
  34. +2
    -2
      providers/implementations/macs/blake2_mac_impl.c
  35. +2
    -2
      providers/implementations/macs/cmac_prov.c
  36. +2
    -2
      providers/implementations/macs/gmac_prov.c
  37. +2
    -2
      providers/implementations/macs/hmac_prov.c
  38. +2
    -2
      providers/implementations/macs/kmac_prov.c
  39. +2
    -2
      providers/implementations/macs/poly1305_prov.c
  40. +2
    -2
      providers/implementations/macs/siphash_prov.c
  41. +2
    -2
      providers/implementations/rands/drbg_ctr.c
  42. +2
    -2
      providers/implementations/rands/drbg_hash.c
  43. +2
    -2
      providers/implementations/rands/drbg_hmac.c
  44. +2
    -2
      providers/implementations/rands/test_rng.c
  45. +1
    -1
      providers/implementations/serializers/deserialize_der2key.c
  46. +1
    -1
      providers/implementations/serializers/deserialize_pem2der.c
  47. +1
    -1
      providers/implementations/serializers/serializer_dh_priv.c
  48. +1
    -1
      providers/implementations/serializers/serializer_dsa_priv.c
  49. +1
    -1
      providers/implementations/serializers/serializer_ec_priv.c
  50. +1
    -1
      providers/implementations/serializers/serializer_ecx_priv.c
  51. +1
    -1
      providers/implementations/serializers/serializer_rsa_priv.c
  52. +2
    -2
      providers/implementations/signature/dsa.c
  53. +2
    -2
      providers/implementations/signature/ecdsa.c
  54. +2
    -2
      providers/implementations/signature/rsa.c

+ 2
- 2
providers/implementations/asymciphers/rsa_enc.c View File

@ -382,7 +382,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *rsa_gettable_ctx_params(void)
static const OSSL_PARAM *rsa_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -526,7 +526,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *rsa_settable_ctx_params(void)
static const OSSL_PARAM *rsa_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c View File

@ -59,7 +59,7 @@ static const OSSL_PARAM cipher_aes_known_settable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
OSSL_PARAM_END
};
const OSSL_PARAM *aes_settable_ctx_params(void)
const OSSL_PARAM *aes_settable_ctx_params(void *provctx)
{
return cipher_aes_known_settable_ctx_params;
}
@ -250,7 +250,7 @@ static const OSSL_PARAM cipher_aes_known_gettable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),
OSSL_PARAM_END
};
const OSSL_PARAM *aes_gettable_ctx_params(void)
const OSSL_PARAM *aes_gettable_ctx_params(void *provctx)
{
return cipher_aes_known_gettable_ctx_params;
}


+ 4
- 3
providers/implementations/ciphers/cipher_aes_ocb.c View File

@ -39,6 +39,8 @@ static OSSL_FUNC_cipher_freectx_fn aes_ocb_freectx;
static OSSL_FUNC_cipher_dupctx_fn aes_ocb_dupctx;
static OSSL_FUNC_cipher_get_ctx_params_fn aes_ocb_get_ctx_params;
static OSSL_FUNC_cipher_set_ctx_params_fn aes_ocb_set_ctx_params;
static OSSL_FUNC_cipher_gettable_ctx_params_fn cipher_ocb_gettable_ctx_params;
static OSSL_FUNC_cipher_settable_ctx_params_fn cipher_ocb_settable_ctx_params;
/*
* The following methods could be moved into PROV_AES_OCB_HW if
@ -437,7 +439,7 @@ static const OSSL_PARAM cipher_ocb_known_gettable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *cipher_ocb_gettable_ctx_params(void)
static const OSSL_PARAM *cipher_ocb_gettable_ctx_params(void *provctx)
{
return cipher_ocb_known_gettable_ctx_params;
}
@ -448,7 +450,7 @@ static const OSSL_PARAM cipher_ocb_known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *cipher_ocb_settable_ctx_params(void)
static const OSSL_PARAM *cipher_ocb_settable_ctx_params(void *provctx)
{
return cipher_ocb_known_settable_ctx_params;
}
@ -513,4 +515,3 @@ const OSSL_DISPATCH aes##kbits##mode##_functions[] = { \
IMPLEMENT_cipher(ocb, OCB, AES_OCB_FLAGS, 256, 128, OCB_DEFAULT_IV_LEN * 8);
IMPLEMENT_cipher(ocb, OCB, AES_OCB_FLAGS, 192, 128, OCB_DEFAULT_IV_LEN * 8);
IMPLEMENT_cipher(ocb, OCB, AES_OCB_FLAGS, 128, 128, OCB_DEFAULT_IV_LEN * 8);

+ 17
- 3
providers/implementations/ciphers/cipher_aes_siv.c View File

@ -166,7 +166,7 @@ static const OSSL_PARAM aes_siv_known_gettable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *aes_siv_gettable_ctx_params(void)
static const OSSL_PARAM *aes_siv_gettable_ctx_params(void *provctx)
{
return aes_siv_known_gettable_ctx_params;
}
@ -216,19 +216,33 @@ static const OSSL_PARAM aes_siv_known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *aes_siv_settable_ctx_params(void)
static const OSSL_PARAM *aes_siv_settable_ctx_params(void *provctx)
{
return aes_siv_known_settable_ctx_params;
}
#define IMPLEMENT_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits) \
static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx; \
static OSSL_FUNC_cipher_freectx_fn alg##_##lc##_freectx; \
static OSSL_FUNC_cipher_dupctx_fn lc##_dupctx; \
static OSSL_FUNC_cipher_encrypt_init_fn lc##_einit; \
static OSSL_FUNC_cipher_decrypt_init_fn lc##_dinit; \
static OSSL_FUNC_cipher_update_fn lc##_stream_update; \
static OSSL_FUNC_cipher_final_fn lc##_stream_final; \
static OSSL_FUNC_cipher_cipher_fn lc##_cipher; \
static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params; \
static OSSL_FUNC_cipher_gettable_params_fn alg##_##lc##_gettable_ctx_params; \
static OSSL_FUNC_cipher_get_ctx_params_fn alg##_##lc##_get_ctx_params; \
static OSSL_FUNC_cipher_gettable_ctx_params_fn \
alg##_##lc##_gettable_ctx_params; \
static OSSL_FUNC_cipher_set_ctx_params_fn alg##_##lc##_set_ctx_params; \
static OSSL_FUNC_cipher_settable_ctx_params_fn \
alg##_##lc##_settable_ctx_params; \
static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[]) \
{ \
return cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, \
flags, 2*kbits, blkbits, ivbits); \
} \
static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx; \
static void * alg##kbits##lc##_newctx(void *provctx) \
{ \
return alg##_##lc##_newctx(provctx, 2*kbits, EVP_CIPH_##UCMODE##_MODE, \


+ 1
- 1
providers/implementations/ciphers/cipher_aes_xts.c View File

@ -211,7 +211,7 @@ static const OSSL_PARAM aes_xts_known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *aes_xts_settable_ctx_params(void)
static const OSSL_PARAM *aes_xts_settable_ctx_params(void *provctx)
{
return aes_xts_known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/ciphers/cipher_chacha20.c View File

@ -91,7 +91,7 @@ static const OSSL_PARAM chacha20_known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
OSSL_PARAM_END
};
const OSSL_PARAM *chacha20_gettable_ctx_params(void)
const OSSL_PARAM *chacha20_gettable_ctx_params(void *provctx)
{
return chacha20_known_gettable_ctx_params;
}
@ -131,7 +131,7 @@ static const OSSL_PARAM chacha20_known_settable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
OSSL_PARAM_END
};
const OSSL_PARAM *chacha20_settable_ctx_params(void)
const OSSL_PARAM *chacha20_settable_ctx_params(void *provctx)
{
return chacha20_known_settable_ctx_params;
}


+ 1
- 1
providers/implementations/ciphers/cipher_chacha20_poly1305.c View File

@ -135,7 +135,7 @@ static const OSSL_PARAM chacha20_poly1305_known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params(void)
static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params(void *provctx)
{
return chacha20_poly1305_known_gettable_ctx_params;
}


+ 2
- 2
providers/implementations/ciphers/cipher_null.c View File

@ -95,7 +95,7 @@ static const OSSL_PARAM null_known_gettable_ctx_params[] = {
};
static OSSL_FUNC_cipher_gettable_ctx_params_fn null_gettable_ctx_params;
static const OSSL_PARAM *null_gettable_ctx_params(void)
static const OSSL_PARAM *null_gettable_ctx_params(void *provctx)
{
return null_known_gettable_ctx_params;
}
@ -131,7 +131,7 @@ static const OSSL_PARAM null_known_settable_ctx_params[] = {
};
static OSSL_FUNC_cipher_settable_ctx_params_fn null_settable_ctx_params;
static const OSSL_PARAM *null_settable_ctx_params(void)
static const OSSL_PARAM *null_settable_ctx_params(void *provctx)
{
return null_known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/ciphers/cipher_rc4_hmac_md5.c View File

@ -72,7 +72,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
OSSL_PARAM_END
};
const OSSL_PARAM *rc4_hmac_md5_gettable_ctx_params(void)
const OSSL_PARAM *rc4_hmac_md5_gettable_ctx_params(void *provctx)
{
return rc4_hmac_md5_known_gettable_ctx_params;
}
@ -107,7 +107,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD, NULL, 0),
OSSL_PARAM_END
};
const OSSL_PARAM *rc4_hmac_md5_settable_ctx_params(void)
const OSSL_PARAM *rc4_hmac_md5_settable_ctx_params(void *provctx)
{
return rc4_hmac_md5_known_settable_ctx_params;
}


+ 3
- 3
providers/implementations/ciphers/ciphercommon.c View File

@ -29,7 +29,7 @@ static const OSSL_PARAM cipher_known_gettable_params[] = {
{ OSSL_CIPHER_PARAM_TLS_MAC, OSSL_PARAM_OCTET_PTR, NULL, 0, OSSL_PARAM_UNMODIFIED },
OSSL_PARAM_END
};
const OSSL_PARAM *cipher_generic_gettable_params(void)
const OSSL_PARAM *cipher_generic_gettable_params(void *provctx)
{
return cipher_known_gettable_params;
}
@ -117,7 +117,7 @@ static const OSSL_PARAM cipher_aead_known_gettable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0),
OSSL_PARAM_END
};
const OSSL_PARAM *cipher_aead_gettable_ctx_params(void)
const OSSL_PARAM *cipher_aead_gettable_ctx_params(void *provctx)
{
return cipher_aead_known_gettable_ctx_params;
}
@ -130,7 +130,7 @@ static const OSSL_PARAM cipher_aead_known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, NULL, 0),
OSSL_PARAM_END
};
const OSSL_PARAM *cipher_aead_settable_ctx_params(void)
const OSSL_PARAM *cipher_aead_settable_ctx_params(void *provctx)
{
return cipher_aead_known_settable_ctx_params;
}


+ 1
- 1
providers/implementations/digests/digestcommon.c View File

@ -40,7 +40,7 @@ static const OSSL_PARAM digest_default_known_gettable_params[] = {
OSSL_PARAM_ulong(OSSL_DIGEST_PARAM_FLAGS, NULL),
OSSL_PARAM_END
};
const OSSL_PARAM *digest_default_gettable_params(void)
const OSSL_PARAM *digest_default_gettable_params(void *provctx)
{
return digest_default_known_gettable_params;
}

+ 1
- 1
providers/implementations/digests/md5_sha1_prov.c View File

@ -30,7 +30,7 @@ static const OSSL_PARAM known_md5_sha1_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *md5_sha1_settable_ctx_params(void)
static const OSSL_PARAM *md5_sha1_settable_ctx_params(void *provctx)
{
return known_md5_sha1_settable_ctx_params;
}


+ 1
- 1
providers/implementations/digests/mdc2_prov.c View File

@ -30,7 +30,7 @@ static const OSSL_PARAM known_mdc2_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *mdc2_settable_ctx_params(void)
static const OSSL_PARAM *mdc2_settable_ctx_params(void *provctx)
{
return known_mdc2_settable_ctx_params;
}


+ 1
- 1
providers/implementations/digests/sha2_prov.c View File

@ -31,7 +31,7 @@ static const OSSL_PARAM known_sha1_settable_ctx_params[] = {
{OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0},
OSSL_PARAM_END
};
static const OSSL_PARAM *sha1_settable_ctx_params(void)
static const OSSL_PARAM *sha1_settable_ctx_params(void *provctx)
{
return known_sha1_settable_ctx_params;
}


+ 1
- 1
providers/implementations/digests/sha3_prov.c View File

@ -250,7 +250,7 @@ static const OSSL_PARAM known_shake_settable_ctx_params[] = {
{OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
OSSL_PARAM_END
};
static const OSSL_PARAM *shake_settable_ctx_params(void)
static const OSSL_PARAM *shake_settable_ctx_params(void *provctx)
{
return known_shake_settable_ctx_params;
}


+ 1
- 1
providers/implementations/exchange/dh_exch.c View File

@ -163,7 +163,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dh_settable_ctx_params(void)
static const OSSL_PARAM *dh_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/exchange/ecdh_exch.c View File

@ -279,7 +279,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
};
static
const OSSL_PARAM *ecdh_settable_ctx_params(void)
const OSSL_PARAM *ecdh_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}
@ -360,7 +360,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
};
static
const OSSL_PARAM *ecdh_gettable_ctx_params(void)
const OSSL_PARAM *ecdh_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}


+ 2
- 2
providers/implementations/include/prov/ciphercommon.h View File

@ -319,7 +319,7 @@ static const OSSL_PARAM name##_known_gettable_ctx_params[] = { \
#define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(name) \
OSSL_PARAM_END \
}; \
const OSSL_PARAM * name##_gettable_ctx_params(void) \
const OSSL_PARAM * name##_gettable_ctx_params(void *provctx) \
{ \
return name##_known_gettable_ctx_params; \
}
@ -331,7 +331,7 @@ static const OSSL_PARAM name##_known_settable_ctx_params[] = { \
#define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(name) \
OSSL_PARAM_END \
}; \
const OSSL_PARAM * name##_settable_ctx_params(void) \
const OSSL_PARAM * name##_settable_ctx_params(void *provctx) \
{ \
return name##_known_settable_ctx_params; \
}


+ 1
- 1
providers/implementations/include/prov/digestcommon.h View File

@ -93,7 +93,7 @@ PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(name, CTX, blksize, dgstsize, flags, \
PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
const OSSL_PARAM *digest_default_gettable_params(void);
const OSSL_PARAM *digest_default_gettable_params(void *provctx);
int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz,
unsigned long flags);


+ 2
- 2
providers/implementations/kdfs/hkdf.c View File

@ -225,7 +225,7 @@ static int kdf_hkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kdf_hkdf_settable_ctx_params(void)
static const OSSL_PARAM *kdf_hkdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_MODE, NULL, 0),
@ -250,7 +250,7 @@ static int kdf_hkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(void)
static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 4
- 2
providers/implementations/kdfs/kbkdf.c View File

@ -76,6 +76,8 @@ static OSSL_FUNC_kdf_reset_fn kbkdf_reset;
static OSSL_FUNC_kdf_derive_fn kbkdf_derive;
static OSSL_FUNC_kdf_settable_ctx_params_fn kbkdf_settable_ctx_params;
static OSSL_FUNC_kdf_set_ctx_params_fn kbkdf_set_ctx_params;
static OSSL_FUNC_kdf_gettable_ctx_params_fn kbkdf_gettable_ctx_params;
static OSSL_FUNC_kdf_get_ctx_params_fn kbkdf_get_ctx_params;
/* Not all platforms have htobe32(). */
static uint32_t be32(uint32_t host)
@ -296,7 +298,7 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kbkdf_settable_ctx_params(void)
static const OSSL_PARAM *kbkdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),
@ -326,7 +328,7 @@ static int kbkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return OSSL_PARAM_set_size_t(p, SIZE_MAX);
}
static const OSSL_PARAM *kbkdf_gettable_ctx_params(void)
static const OSSL_PARAM *kbkdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] =
{ OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), OSSL_PARAM_END };


+ 2
- 2
providers/implementations/kdfs/krb5kdf.c View File

@ -140,7 +140,7 @@ static int krb5kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *krb5kdf_settable_ctx_params(void)
static const OSSL_PARAM *krb5kdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@ -170,7 +170,7 @@ static int krb5kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *krb5kdf_gettable_ctx_params(void)
static const OSSL_PARAM *krb5kdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 4
- 2
providers/implementations/kdfs/pbkdf2.c View File

@ -41,6 +41,8 @@ static OSSL_FUNC_kdf_reset_fn kdf_pbkdf2_reset;
static OSSL_FUNC_kdf_derive_fn kdf_pbkdf2_derive;
static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_pbkdf2_settable_ctx_params;
static OSSL_FUNC_kdf_set_ctx_params_fn kdf_pbkdf2_set_ctx_params;
static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_pbkdf2_gettable_ctx_params;
static OSSL_FUNC_kdf_get_ctx_params_fn kdf_pbkdf2_get_ctx_params;
static int pbkdf2_derive(const char *pass, size_t passlen,
const unsigned char *salt, int saltlen, uint64_t iter,
@ -198,7 +200,7 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(void)
static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@ -221,7 +223,7 @@ static int kdf_pbkdf2_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(void)
static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 4
- 2
providers/implementations/kdfs/scrypt.c View File

@ -29,6 +29,8 @@ static OSSL_FUNC_kdf_reset_fn kdf_scrypt_reset;
static OSSL_FUNC_kdf_derive_fn kdf_scrypt_derive;
static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_scrypt_settable_ctx_params;
static OSSL_FUNC_kdf_set_ctx_params_fn kdf_scrypt_set_ctx_params;
static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_scrypt_gettable_ctx_params;
static OSSL_FUNC_kdf_get_ctx_params_fn kdf_scrypt_get_ctx_params;
static int scrypt_alg(const char *pass, size_t passlen,
const unsigned char *salt, size_t saltlen,
@ -190,7 +192,7 @@ static int kdf_scrypt_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kdf_scrypt_settable_ctx_params(void)
static const OSSL_PARAM *kdf_scrypt_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_KDF_PARAM_PASSWORD, NULL, 0),
@ -213,7 +215,7 @@ static int kdf_scrypt_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(void)
static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 2
- 2
providers/implementations/kdfs/sshkdf.c View File

@ -160,7 +160,7 @@ static int kdf_sshkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(void)
static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@ -183,7 +183,7 @@ static int kdf_sshkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *kdf_sshkdf_gettable_ctx_params(void)
static const OSSL_PARAM *kdf_sshkdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 2
- 2
providers/implementations/kdfs/sskdf.c View File

@ -478,7 +478,7 @@ static int sskdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *sskdf_settable_ctx_params(void)
static const OSSL_PARAM *sskdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SECRET, NULL, 0),
@ -504,7 +504,7 @@ static int sskdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *sskdf_gettable_ctx_params(void)
static const OSSL_PARAM *sskdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 4
- 2
providers/implementations/kdfs/tls1_prf.c View File

@ -67,6 +67,8 @@ static OSSL_FUNC_kdf_reset_fn kdf_tls1_prf_reset;
static OSSL_FUNC_kdf_derive_fn kdf_tls1_prf_derive;
static OSSL_FUNC_kdf_settable_ctx_params_fn kdf_tls1_prf_settable_ctx_params;
static OSSL_FUNC_kdf_set_ctx_params_fn kdf_tls1_prf_set_ctx_params;
static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_tls1_prf_gettable_ctx_params;
static OSSL_FUNC_kdf_get_ctx_params_fn kdf_tls1_prf_get_ctx_params;
static int tls1_prf_alg(EVP_MAC_CTX *mdctx, EVP_MAC_CTX *sha1ctx,
const unsigned char *sec, size_t slen,
@ -201,7 +203,7 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(void)
static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@ -222,7 +224,7 @@ static int kdf_tls1_prf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *kdf_tls1_prf_gettable_ctx_params(void)
static const OSSL_PARAM *kdf_tls1_prf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 2
- 2
providers/implementations/kdfs/x942kdf.c View File

@ -402,7 +402,7 @@ static int x942kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return 1;
}
static const OSSL_PARAM *x942kdf_settable_ctx_params(void)
static const OSSL_PARAM *x942kdf_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@ -426,7 +426,7 @@ static int x942kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
return -2;
}
static const OSSL_PARAM *x942kdf_gettable_ctx_params(void)
static const OSSL_PARAM *x942kdf_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),


+ 2
- 2
providers/implementations/keymgmt/dh_kmgmt.c View File

@ -326,7 +326,7 @@ static const OSSL_PARAM dh_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dh_gettable_params(void)
static const OSSL_PARAM *dh_gettable_params(void *provctx)
{
return dh_params;
}
@ -336,7 +336,7 @@ static const OSSL_PARAM dh_known_settable_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dh_settable_params(void)
static const OSSL_PARAM *dh_settable_params(void *provctx)
{
return dh_known_settable_params;
}


+ 1
- 1
providers/implementations/keymgmt/dsa_kmgmt.c View File

@ -295,7 +295,7 @@ static const OSSL_PARAM dsa_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dsa_gettable_params(void)
static const OSSL_PARAM *dsa_gettable_params(void *provctx)
{
return dsa_params;
}


+ 2
- 2
providers/implementations/keymgmt/ec_kmgmt.c View File

@ -570,7 +570,7 @@ static const OSSL_PARAM ec_known_gettable_params[] = {
};
static
const OSSL_PARAM *ec_gettable_params(void)
const OSSL_PARAM *ec_gettable_params(void *provctx)
{
return ec_known_gettable_params;
}
@ -582,7 +582,7 @@ static const OSSL_PARAM ec_known_settable_params[] = {
};
static
const OSSL_PARAM *ec_settable_params(void)
const OSSL_PARAM *ec_settable_params(void *provctx)
{
return ec_known_settable_params;
}


+ 8
- 8
providers/implementations/keymgmt/ecx_kmgmt.c View File

@ -314,22 +314,22 @@ static const OSSL_PARAM ed_gettable_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *x25519_gettable_params(void)
static const OSSL_PARAM *x25519_gettable_params(void *provctx)
{
return ecx_gettable_params;
}
static const OSSL_PARAM *x448_gettable_params(void)
static const OSSL_PARAM *x448_gettable_params(void *provctx)
{
return ecx_gettable_params;
}
static const OSSL_PARAM *ed25519_gettable_params(void)
static const OSSL_PARAM *ed25519_gettable_params(void *provctx)
{
return ed_gettable_params;
}
static const OSSL_PARAM *ed448_gettable_params(void)
static const OSSL_PARAM *ed448_gettable_params(void *provctx)
{
return ed_gettable_params;
}
@ -384,22 +384,22 @@ static const OSSL_PARAM ed_settable_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *x25519_settable_params(void)
static const OSSL_PARAM *x25519_settable_params(void *provctx)
{
return ecx_settable_params;
}
static const OSSL_PARAM *x448_settable_params(void)
static const OSSL_PARAM *x448_settable_params(void *provctx)
{
return ecx_settable_params;
}
static const OSSL_PARAM *ed25519_settable_params(void)
static const OSSL_PARAM *ed25519_settable_params(void *provctx)
{
return ed_settable_params;
}
static const OSSL_PARAM *ed448_settable_params(void)
static const OSSL_PARAM *ed448_settable_params(void *provctx)
{
return ed_settable_params;
}


+ 1
- 1
providers/implementations/keymgmt/rsa_kmgmt.c View File

@ -341,7 +341,7 @@ static const OSSL_PARAM rsa_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *rsa_gettable_params(void)
static const OSSL_PARAM *rsa_gettable_params(void *provctx)
{
return rsa_params;
}


+ 2
- 2
providers/implementations/macs/blake2_mac_impl.c View File

@ -108,7 +108,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *blake2_gettable_ctx_params(void)
static const OSSL_PARAM *blake2_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -130,7 +130,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_SALT, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *blake2_mac_settable_ctx_params()
static const OSSL_PARAM *blake2_mac_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/cmac_prov.c View File

@ -125,7 +125,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *cmac_gettable_ctx_params(void)
static const OSSL_PARAM *cmac_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -146,7 +146,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *cmac_settable_ctx_params(void)
static const OSSL_PARAM *cmac_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/gmac_prov.c View File

@ -136,7 +136,7 @@ static const OSSL_PARAM known_gettable_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *gmac_gettable_params(void)
static const OSSL_PARAM *gmac_gettable_params(void *provctx)
{
return known_gettable_params;
}
@ -158,7 +158,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_IV, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *gmac_settable_ctx_params(void)
static const OSSL_PARAM *gmac_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/hmac_prov.c View File

@ -139,7 +139,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *hmac_gettable_ctx_params(void)
static const OSSL_PARAM *hmac_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -161,7 +161,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_int(OSSL_MAC_PARAM_FLAGS, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *hmac_settable_ctx_params(void)
static const OSSL_PARAM *hmac_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/kmac_prov.c View File

@ -307,7 +307,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *kmac_gettable_ctx_params(void)
static const OSSL_PARAM *kmac_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -329,7 +329,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_CUSTOM, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *kmac_settable_ctx_params(void)
static const OSSL_PARAM *kmac_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/poly1305_prov.c View File

@ -101,7 +101,7 @@ static const OSSL_PARAM known_gettable_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *poly1305_gettable_params(void)
static const OSSL_PARAM *poly1305_gettable_params(void *provctx)
{
return known_gettable_params;
}
@ -120,7 +120,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *poly1305_settable_ctx_params(void)
static const OSSL_PARAM *poly1305_settable_ctx_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/macs/siphash_prov.c View File

@ -112,7 +112,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
OSSL_PARAM_END
};
static const OSSL_PARAM *siphash_gettable_ctx_params(void)
static const OSSL_PARAM *siphash_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -132,7 +132,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0),
OSSL_PARAM_END
};
static const OSSL_PARAM *siphash_settable_params(void)
static const OSSL_PARAM *siphash_settable_params(void *provctx)
{
return known_settable_ctx_params;
}


+ 2
- 2
providers/implementations/rands/drbg_ctr.c View File

@ -635,7 +635,7 @@ static int drbg_ctr_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
return drbg_get_ctx_params(drbg, params);
}
static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(void)
static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
@ -701,7 +701,7 @@ static int drbg_ctr_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return drbg_set_ctx_params(ctx, params);
}
static const OSSL_PARAM *drbg_ctr_settable_ctx_params(void)
static const OSSL_PARAM *drbg_ctr_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),


+ 2
- 2
providers/implementations/rands/drbg_hash.c View File

@ -432,7 +432,7 @@ static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
return drbg_get_ctx_params(drbg, params);
}
static const OSSL_PARAM *drbg_hash_gettable_ctx_params(void)
static const OSSL_PARAM *drbg_hash_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
@ -476,7 +476,7 @@ static int drbg_hash_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return drbg_set_ctx_params(ctx, params);
}
static const OSSL_PARAM *drbg_hash_settable_ctx_params(void)
static const OSSL_PARAM *drbg_hash_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),


+ 2
- 2
providers/implementations/rands/drbg_hmac.c View File

@ -329,7 +329,7 @@ static int drbg_hmac_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
return drbg_get_ctx_params(drbg, params);
}
static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(void)
static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
@ -378,7 +378,7 @@ static int drbg_hmac_set_ctx_params(void *vctx, const OSSL_PARAM params[])
return drbg_set_ctx_params(ctx, params);
}
static const OSSL_PARAM *drbg_hmac_settable_ctx_params(void)
static const OSSL_PARAM *drbg_hmac_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),


+ 2
- 2
providers/implementations/rands/test_rng.c View File

@ -186,7 +186,7 @@ static int test_rng_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
return drbg_get_ctx_params(drbg, params);
}
static const OSSL_PARAM *test_rng_gettable_ctx_params(void)
static const OSSL_PARAM *test_rng_gettable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_DRBG_GETABLE_CTX_COMMON,
@ -264,7 +264,7 @@ static int test_rng_set_ctx_params(void *vdrbg, const OSSL_PARAM params[])
return drbg_set_ctx_params(drbg, params);
}
static const OSSL_PARAM *test_rng_settable_ctx_params(void)
static const OSSL_PARAM *test_rng_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, NULL, 0),


+ 1
- 1
providers/implementations/serializers/deserialize_der2key.c View File

@ -72,7 +72,7 @@ static void der2key_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *der2key_gettable_params(void)
static const OSSL_PARAM *der2key_gettable_params(void *provctx)
{
static const OSSL_PARAM gettables[] = {
{ OSSL_DESERIALIZER_PARAM_INPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 },


+ 1
- 1
providers/implementations/serializers/deserialize_pem2der.c View File

@ -55,7 +55,7 @@ static void pem2der_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *pem2der_gettable_params(void)
static const OSSL_PARAM *pem2der_gettable_params(void *provctx)
{
static const OSSL_PARAM gettables[] = {
{ OSSL_DESERIALIZER_PARAM_INPUT_TYPE, OSSL_PARAM_UTF8_PTR, NULL, 0, 0 },


+ 1
- 1
providers/implementations/serializers/serializer_dh_priv.c View File

@ -71,7 +71,7 @@ static void dh_priv_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *dh_priv_settable_ctx_params(void)
static const OSSL_PARAM *dh_priv_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM settables[] = {
OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0),


+ 1
- 1
providers/implementations/serializers/serializer_dsa_priv.c View File

@ -71,7 +71,7 @@ static void dsa_priv_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *dsa_priv_settable_ctx_params(void)
static const OSSL_PARAM *dsa_priv_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM settables[] = {
OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0),


+ 1
- 1
providers/implementations/serializers/serializer_ec_priv.c View File

@ -65,7 +65,7 @@ static void ec_priv_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *ec_priv_settable_ctx_params(void)
static const OSSL_PARAM *ec_priv_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM settables[] = {
OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0),


+ 1
- 1
providers/implementations/serializers/serializer_ecx_priv.c View File

@ -88,7 +88,7 @@ static void ecx_priv_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *ecx_priv_settable_ctx_params(void)
static const OSSL_PARAM *ecx_priv_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM settables[] = {
OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0),


+ 1
- 1
providers/implementations/serializers/serializer_rsa_priv.c View File

@ -73,7 +73,7 @@ static void rsa_priv_freectx(void *vctx)
OPENSSL_free(ctx);
}
static const OSSL_PARAM *rsa_priv_settable_ctx_params(void)
static const OSSL_PARAM *rsa_priv_settable_ctx_params(void *provctx)
{
static const OSSL_PARAM settables[] = {
OSSL_PARAM_utf8_string(OSSL_SERIALIZER_PARAM_CIPHER, NULL, 0),


+ 2
- 2
providers/implementations/signature/dsa.c View File

@ -412,7 +412,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dsa_gettable_ctx_params(void)
static const OSSL_PARAM *dsa_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -454,7 +454,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *dsa_settable_ctx_params(void)
static const OSSL_PARAM *dsa_settable_ctx_params(void *provctx)
{
/*
* TODO(3.0): Should this function return a different set of settable ctx


+ 2
- 2
providers/implementations/signature/ecdsa.c View File

@ -399,7 +399,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *ecdsa_gettable_ctx_params(void)
static const OSSL_PARAM *ecdsa_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -451,7 +451,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *ecdsa_settable_ctx_params(void)
static const OSSL_PARAM *ecdsa_settable_ctx_params(void *provctx)
{
/*
* TODO(3.0): Should this function return a different set of settable ctx


+ 2
- 2
providers/implementations/signature/rsa.c View File

@ -983,7 +983,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *rsa_gettable_ctx_params(void)
static const OSSL_PARAM *rsa_gettable_ctx_params(void *provctx)
{
return known_gettable_ctx_params;
}
@ -1233,7 +1233,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
OSSL_PARAM_END
};
static const OSSL_PARAM *rsa_settable_ctx_params(void)
static const OSSL_PARAM *rsa_settable_ctx_params(void *provctx)
{
/*
* TODO(3.0): Should this function return a different set of settable ctx


Loading…
Cancel
Save