denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/agent/agent_private_key.c
+1 -1
View File
@@ -391,7 +391,7 @@ METHOD(private_key_t, get_type, key_type_t,
METHOD(private_key_t, decrypt, bool,
private_agent_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, "private key decryption not supported by ssh-agent");
return FALSE;
src/libstrongswan/plugins/bliss/bliss_private_key.c
+1 -1
View File
@@ -538,7 +538,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_bliss_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, "encryption scheme %N not supported",
encryption_scheme_names, scheme);
src/libstrongswan/plugins/bliss/bliss_public_key.c
+1 -1
View File
@@ -220,7 +220,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt_, bool,
private_bliss_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypto)
void *params, chunk_t plain, chunk_t *crypto)
{
DBG1(DBG_LIB, "encryption scheme %N not supported",
encryption_scheme_names, scheme);
src/libstrongswan/plugins/bliss/tests/suites/test_bliss_sign.c
+2 -2
View File
@@ -168,8 +168,8 @@ START_TEST(test_bliss_sign_fail)
ck_assert(!pubkey->get_fingerprint(pubkey, KEYID_PGPV4, &fp));
/* encryption / decryption operation is not defined for BLISS */
ck_assert(!pubkey->encrypt(pubkey, ENCRYPT_UNKNOWN, chunk_empty, NULL));
ck_assert(!privkey->decrypt(privkey, ENCRYPT_UNKNOWN, chunk_empty, NULL));
ck_assert(!pubkey->encrypt(pubkey, ENCRYPT_UNKNOWN, NULL, chunk_empty, NULL));
ck_assert(!privkey->decrypt(privkey, ENCRYPT_UNKNOWN, NULL, chunk_empty, NULL));
/* sign with invalid signature scheme */
ck_assert(!privkey->sign(privkey, SIGN_UNKNOWN, NULL, msg, &signature));
src/libstrongswan/plugins/botan/botan_ec_private_key.c
+1 -1
View File
@@ -141,7 +141,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_botan_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;
src/libstrongswan/plugins/botan/botan_ec_public_key.c
+1 -1
View File
@@ -190,7 +190,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_botan_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;
src/libstrongswan/plugins/botan/botan_ed_private_key.c
+1 -1
View File
@@ -74,7 +74,7 @@ METHOD(private_key_t, sign, bool,
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;
src/libstrongswan/plugins/botan/botan_ed_public_key.c
+1 -1
View File
@@ -82,7 +82,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, "EdDSA public key encryption not implemented");
return FALSE;
src/libstrongswan/plugins/botan/botan_rsa_private_key.c
+1 -1
View File
@@ -159,7 +159,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_botan_rsa_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
botan_pk_op_decrypt_t decrypt_op;
const char *padding;
src/libstrongswan/plugins/botan/botan_rsa_public_key.c
+1 -1
View File
@@ -139,7 +139,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_botan_rsa_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypto)
void *params, chunk_t plain, chunk_t *crypto)
{
botan_pk_op_encrypt_t encrypt_op;
botan_rng_t rng;
src/libstrongswan/plugins/curve25519/curve25519_private_key.c
+1 -1
View File
@@ -113,7 +113,7 @@ end:
METHOD(private_key_t, decrypt, bool,
private_curve25519_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, "encryption scheme %N not supported", encryption_scheme_names,
scheme);
src/libstrongswan/plugins/curve25519/curve25519_public_key.c
+1 -1
View File
@@ -139,7 +139,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt_, bool,
private_curve25519_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypto)
void *params, chunk_t plain, chunk_t *crypto)
{
DBG1(DBG_LIB, "encryption scheme %N not supported", encryption_scheme_names,
scheme);
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_private_key.c
+1 -1
View File
@@ -278,7 +278,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_gcrypt_rsa_private_key_t *this, encryption_scheme_t scheme,
chunk_t encrypted, chunk_t *plain)
void *params, chunk_t encrypted, chunk_t *plain)
{
gcry_error_t err;
gcry_sexp_t in, out;
src/libstrongswan/plugins/gcrypt/gcrypt_rsa_public_key.c
+1 -1
View File
@@ -237,7 +237,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt_, bool,
private_gcrypt_rsa_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *encrypted)
void *params, chunk_t plain, chunk_t *encrypted)
{
gcry_sexp_t in, out;
gcry_error_t err;
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
+1 -1
View File
@@ -494,7 +494,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_gmp_rsa_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypto, chunk_t *plain)
void *params, chunk_t crypto, chunk_t *plain)
{
chunk_t em, stripped;
bool success = FALSE;
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
+1 -1
View File
@@ -313,7 +313,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt_, bool,
private_gmp_rsa_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypto)
void *params, chunk_t plain, chunk_t *crypto)
{
chunk_t em;
u_char *pos;
src/libstrongswan/plugins/openssl/openssl_ec_private_key.c
+1 -1
View File
@@ -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;
src/libstrongswan/plugins/openssl/openssl_ec_public_key.c
+1 -1
View File
@@ -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;
src/libstrongswan/plugins/openssl/openssl_ed_private_key.c
+1 -1
View File
@@ -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;
src/libstrongswan/plugins/openssl/openssl_ed_public_key.c
+1 -1
View File
@@ -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);
src/libstrongswan/plugins/openssl/openssl_pkcs7.c
+1 -1
View File
@@ -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);
src/libstrongswan/plugins/openssl/openssl_rsa_private_key.c
+1 -1
View File
@@ -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;
src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
+1 -1
View File
@@ -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;
src/libstrongswan/plugins/pgp/pgp_builder.c
+1 -1
View File
@@ -126,7 +126,7 @@ METHOD(private_key_t, sign_not_allowed, bool,
METHOD(private_key_t, decrypt_not_allowed, bool,
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, "decryption failed - signature only key");
return FALSE;
src/libstrongswan/plugins/pkcs11/pkcs11_private_key.c
+1 -1
View File
@@ -388,7 +388,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_pkcs11_private_key_t *this, encryption_scheme_t scheme,
chunk_t crypt, chunk_t *plain)
void *params, chunk_t crypt, chunk_t *plain)
{
CK_MECHANISM_PTR mechanism;
CK_SESSION_HANDLE session;
src/libstrongswan/plugins/pkcs11/pkcs11_public_key.c
+1 -1
View File
@@ -307,7 +307,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_pkcs11_public_key_t *this, encryption_scheme_t scheme,
chunk_t plain, chunk_t *crypt)
void *params, chunk_t plain, chunk_t *crypt)
{
CK_MECHANISM_PTR mechanism;
CK_SESSION_HANDLE session;
src/libstrongswan/plugins/pkcs7/pkcs7_enveloped_data.c
+2 -2
View File
@@ -137,7 +137,7 @@ static bool decrypt(private_key_t *private, chunk_t key, chunk_t iv, int oid,
DBG1(DBG_LIB, "unsupported content encryption algorithm");
return FALSE;
}
if (!private->decrypt(private, ENCRYPT_RSA_PKCS1, key, &plain_key))
if (!private->decrypt(private, ENCRYPT_RSA_PKCS1, NULL, key, &plain_key))
{
DBG1(DBG_LIB, "symmetric key could not be decrypted with rsa");
return FALSE;
@@ -438,7 +438,7 @@ static bool encrypt_key(certificate_t *cert, chunk_t in, chunk_t *out)
{
return FALSE;
}
if (!key->encrypt(key, ENCRYPT_RSA_PKCS1, in, out))
if (!key->encrypt(key, ENCRYPT_RSA_PKCS1, NULL, in, out))
{
key->destroy(key);
return FALSE;
src/libstrongswan/plugins/wolfssl/wolfssl_ec_private_key.c
+1 -1
View File
@@ -207,7 +207,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_wolfssl_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;
src/libstrongswan/plugins/wolfssl/wolfssl_ec_public_key.c
+1 -1
View File
@@ -195,7 +195,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_wolfssl_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;
src/libstrongswan/plugins/wolfssl/wolfssl_ed_private_key.c
+1 -1
View File
@@ -113,7 +113,7 @@ METHOD(private_key_t, sign, bool,
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;
src/libstrongswan/plugins/wolfssl/wolfssl_ed_public_key.c
+1 -1
View File
@@ -114,7 +114,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);
src/libstrongswan/plugins/wolfssl/wolfssl_rsa_private_key.c
+1 -1
View File
@@ -243,7 +243,7 @@ METHOD(private_key_t, sign, bool,
METHOD(private_key_t, decrypt, bool,
private_wolfssl_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, mgf, len;
enum wc_HashType hash;
src/libstrongswan/plugins/wolfssl/wolfssl_rsa_public_key.c
+1 -1
View File
@@ -218,7 +218,7 @@ METHOD(public_key_t, verify, bool,
METHOD(public_key_t, encrypt, bool,
private_wolfssl_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, mgf, len;
enum wc_HashType hash;