credentials: Added void *params to public_key encrypt() and private_key decrypt() methods

This commit is contained in:
Andreas Steffen
2021-11-09 17:58:28 +01:00
parent c8341fca61
commit 4abb29f639
43 changed files with 50 additions and 48 deletions
@@ -183,7 +183,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_openssl_ec_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
DBG1(DBG_LIB, "EC private key decryption not implemented");
return FALSE;
@@ -183,7 +183,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_openssl_ec_public_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
DBG1(DBG_LIB, "EC public key encryption not implemented");
return FALSE;
@@ -108,7 +108,7 @@ error:
METHOD(private_key_t, decrypt, bool,
private_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
DBG1(DBG_LIB, "EdDSA private key decryption not implemented");
return FALSE;
@@ -118,7 +118,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_public_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
DBG1(DBG_LIB, "encryption scheme %N not supported", encryption_scheme_names,
scheme);
@@ -644,7 +644,7 @@ static bool decrypt(private_openssl_pkcs7_t *this,
{
/* get encryptedKey from internal structure; TODO fixup */
chunk = openssl_asn1_str2chunk(ri->ktri->encryptedKey);
if (private->decrypt(private, ENCRYPT_RSA_PKCS1,
if (private->decrypt(private, ENCRYPT_RSA_PKCS1, NULL,
chunk, &key))
{
private->destroy(private);
@@ -306,7 +306,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_openssl_rsa_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
int padding, len;
char *decrypted;
@@ -307,7 +307,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_openssl_rsa_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypto)
void *params, chunk_t plain, chunk_t *crypto)
{
int padding, len;
char *encrypted;