Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

Public key #97

Merged
merged 10 commits into from
Apr 24, 2023
Merged

Public key #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ba4ab5
Add public key data type
sgrampone Oct 7, 2022
2f265a2
Update jar versions to 18.2.0
sgrampone Dec 16, 2022
ff16ffc
Update jackson libraries to version 2.14.1
sgrampone Dec 16, 2022
12793b6
Update commons-net to version 3.9.0
sgrampone Dec 16, 2022
338e568
Add remove method on sftpclient
sgrampone Dec 22, 2022
b4fdd9a
Fix error codes
sgrampone Dec 22, 2022
9f8c97e
Fix generic
sgrampone Dec 23, 2022
f79d650
GeneXusFtps client remove function implementation
sgrampone Dec 23, 2022
6486a2c
Update version for v118u3 to 18.3.0
sgrampone Mar 20, 2023
a0a9ebb
Merge branch 'master' into public_key
sgrampone Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 94 additions & 22 deletions GeneXusCryptography/src/main/java/com/genexus/cryptography/asymmetric/AsymmetricCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.UnsupportedEncodingException;

import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.crypto.AsymmetricBlockCipher;
import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher;
import org.bouncycastle.crypto.Digest;
Expand All @@ -18,10 +19,13 @@
import com.genexus.cryptography.commons.AsymmetricCipherObject;
import com.genexus.cryptography.hash.Hashing;
import com.genexus.cryptography.hash.utils.HashAlgorithm;
import com.genexus.securityapicommons.commons.Certificate;
import com.genexus.securityapicommons.commons.Key;
import com.genexus.securityapicommons.commons.PublicKey;
import com.genexus.securityapicommons.config.EncodingUtil;
import com.genexus.securityapicommons.keys.CertificateX509;
import com.genexus.securityapicommons.keys.PrivateKeyManager;
import com.genexus.securityapicommons.utils.SecurityUtils;

/**
* @author sgrampone
Expand All @@ -41,37 +45,106 @@ public AsymmetricCipher() {
@Override
public String doEncrypt_WithPrivateKey(String hashAlgorithm, String asymmetricEncryptionPadding, PrivateKeyManager key, String plainText) {

this.error.cleanError();
/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("plainText", plainText, this.error);
SecurityUtils.validateObjectInput("key", key, this.error);
if (this.hasError()) {
return "";
}
return doEncryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, true, plainText);

/******* INPUT VERIFICATION - END *******/

return doEncryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, true, plainText, false);
}

@Override
public String doEncrypt_WithPublicKey(String hashAlgorithm, String asymmetricEncryptionPadding, CertificateX509 certificate, String plainText) {
public String doEncrypt_WithPublicKey(String hashAlgorithm, String asymmetricEncryptionPadding, PublicKey key, String plainText) {

this.error.cleanError();
/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("plainText", plainText, this.error);
SecurityUtils.validateObjectInput("key", key, this.error);
if (this.hasError()) {
return "";
}

/******* INPUT VERIFICATION - END *******/

return doEncryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, false, plainText, true);
}

@Override
public String doEncrypt_WithCertificate(String hashAlgorithm, String asymmetricEncryptionPadding, Certificate certificate, String plainText) {

/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("plainText", plainText, this.error);
SecurityUtils.validateObjectInput("certificate", certificate, this.error);
if (this.hasError()) {
return "";
}
return doEncryptInternal(hashAlgorithm, asymmetricEncryptionPadding, certificate, false, plainText);

/******* INPUT VERIFICATION - END *******/

return doEncryptInternal(hashAlgorithm, asymmetricEncryptionPadding, certificate, false, plainText, false);
}


@Override
public String doDecrypt_WithPrivateKey(String hashAlgorithm, String asymmetricEncryptionPadding, PrivateKeyManager key, String encryptedInput) {


/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("encryptedInput", encryptedInput, this.error);
SecurityUtils.validateObjectInput("key", key, this.error);
if (this.hasError()) {
return "";
}
return doDecryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, true, encryptedInput);

/******* INPUT VERIFICATION - END *******/

return doDecryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, true, encryptedInput, false);
}

@Override
public String doDecrypt_WithPublicKey(String hashAlgorithm, String asymmetricEncryptionPadding, CertificateX509 certificate, String encryptedInput) {
public String doDecrypt_WithPublicKey(String hashAlgorithm, String asymmetricEncryptionPadding, PublicKey key, String encryptedInput) {

/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("encryptedInput", encryptedInput, this.error);
SecurityUtils.validateObjectInput("key", key, this.error);
if (this.hasError()) {
return "";
}

/******* INPUT VERIFICATION - END *******/

return doDecryptInternal(hashAlgorithm, asymmetricEncryptionPadding, key, false, encryptedInput, true);
}

@Override
public String doDecrypt_WithCertificate(String hashAlgorithm, String asymmetricEncryptionPadding, Certificate certificate, String encryptedInput) {

/******* INPUT VERIFICATION - BEGIN *******/
SecurityUtils.validateObjectInput("hashAlgorithm", hashAlgorithm, this.error);
SecurityUtils.validateStringInput("asymmetricEncryptionPadding", asymmetricEncryptionPadding, this.error);
SecurityUtils.validateStringInput("encryptedInput", encryptedInput, this.error);
SecurityUtils.validateObjectInput("certificate", certificate, this.error);
if (this.hasError()) {
return "";
}
return doDecryptInternal(hashAlgorithm, asymmetricEncryptionPadding, certificate, false, encryptedInput);

/******* INPUT VERIFICATION - END *******/

return doDecryptInternal(hashAlgorithm, asymmetricEncryptionPadding, certificate, false, encryptedInput, false);
}

/******** EXTERNAL OBJECT PUBLIC METHODS - END ********/
Expand All @@ -96,9 +169,8 @@ public String doDecrypt_WithPublicKey(String hashAlgorithm, String asymmetricEnc
* @return String Base64 encrypted plainText text
*/
private String doEncryptInternal(String hashAlgorithm, String asymmetricEncryptionPadding, Key key, boolean isPrivate,
String plainText) {
String plainText, boolean isPublicKey) {
error.cleanError();

HashAlgorithm hash = HashAlgorithm.getHashAlgorithm(hashAlgorithm, this.error);
AsymmetricEncryptionPadding padding = AsymmetricEncryptionPadding
.getAsymmetricEncryptionPadding(asymmetricEncryptionPadding, this.error);
Expand All @@ -114,21 +186,21 @@ private String doEncryptInternal(String hashAlgorithm, String asymmetricEncrypti
this.error = keyMan.getError();
return "";
}
asymmetricEncryptionAlgorithm = keyMan.getPrivateKeyAlgorithm();
asymmetricEncryptionAlgorithm = keyMan.getAlgorithm();

asymKey = keyMan.getPrivateKeyParameterForEncryption();
asymKey = keyMan.getAsymmetricKeyParameter();
if (keyMan.hasError()) {
this.error = keyMan.getError();
return "";
}
} else {
CertificateX509 cert = (CertificateX509) key;
if (!cert.Inicialized() || cert.hasError()) {
PublicKey cert = isPublicKey ? (PublicKey)key: (CertificateX509) key;
if (cert.hasError()) {
this.error = cert.getError();
return "";
}
asymmetricEncryptionAlgorithm = cert.getPublicKeyAlgorithm();
asymKey = cert.getPublicKeyParameterForEncryption();
asymmetricEncryptionAlgorithm = cert.getAlgorithm();
asymKey = cert.getAsymmetricKeyParameter();
if (cert.hasError()) {
this.error = cert.getError();
return "";
Expand Down Expand Up @@ -167,7 +239,7 @@ private String doEncryptInternal(String hashAlgorithm, String asymmetricEncrypti
* @return String UTF-8 decypted encryptedInput text
*/
private String doDecryptInternal(String hashAlgorithm, String asymmetricEncryptionPadding, Key key, boolean isPrivate,
String encryptedInput) {
String encryptedInput, boolean isPublicKey) {
this.error.cleanError();
HashAlgorithm hash = HashAlgorithm.getHashAlgorithm(hashAlgorithm, this.error);
AsymmetricEncryptionPadding padding = AsymmetricEncryptionPadding
Expand All @@ -185,21 +257,21 @@ private String doDecryptInternal(String hashAlgorithm, String asymmetricEncrypti
this.error = keyMan.getError();
return "";
}
asymmetricEncryptionAlgorithm = keyMan.getPrivateKeyAlgorithm();
asymmetricEncryptionAlgorithm = keyMan.getAlgorithm();

asymKey = keyMan.getPrivateKeyParameterForEncryption();
asymKey = keyMan.getAsymmetricKeyParameter();
if (keyMan.hasError()) {
this.error = keyMan.getError();
return "";
}
} else {
CertificateX509 cert = (CertificateX509) key;
if (!cert.Inicialized() || cert.hasError()) {
PublicKey cert = isPublicKey ? (PublicKey) key: (CertificateX509) key;
if (cert.hasError()) {
this.error = cert.getError();
return "";
}
asymmetricEncryptionAlgorithm = cert.getPublicKeyAlgorithm();
asymKey = cert.getPublicKeyParameterForEncryption();
asymmetricEncryptionAlgorithm = cert.getAlgorithm();
asymKey = cert.getAsymmetricKeyParameter();
if (cert.hasError()) {
this.error = cert.getError();
return "";
Expand Down
Loading