Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix padding issue when decrypting OVN provider password #683

Merged
merged 2 commits into from
Sep 27, 2022
Merged

Fix padding issue when decrypting OVN provider password #683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d2d8d
Fix padding issue when decrypting OVN provider password
mwperina Sep 27, 2022
34a94e4
Update EngineEncryptionUtils.java
michalskrivanek Sep 27, 2022
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
36 changes: 29 additions & 7 deletions .../modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.Key;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.MGF1ParameterSpec;

import javax.crypto.Cipher;
import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
Expand All @@ -34,6 +38,7 @@ public class EngineEncryptionUtils {
private static final File truststoreFile;
private static final KeyStore.PasswordProtection truststorePassword;


static {
EngineLocalConfig config = EngineLocalConfig.getInstance();
keystoreType = config.getPKIEngineStoreType();
Expand Down Expand Up @@ -152,8 +157,8 @@ public static String encrypt(String source) throws GeneralSecurityException {
return source;
} else {
String encrypted = "$";
Cipher rsa = Cipher.getInstance("RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING");
rsa.init(Cipher.ENCRYPT_MODE, getCertificate().getPublicKey());

Cipher rsa = getInitializedCipher(true, Cipher.ENCRYPT_MODE, getCertificate().getPublicKey());
encrypted += new Base64(0).encodeToString(
rsa.doFinal(source.getBytes(StandardCharsets.UTF_8))
);
Expand All @@ -172,22 +177,39 @@ public static String decrypt(String source) throws GeneralSecurityException {
if (source == null || source.length() == 0) {
return source;
} else {
String cipherString = "RSA";
boolean newCipher = false;

if (source.charAt(0) == '$') {
cipherString = "RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING";
newCipher = true;
source = source.substring(1);
}

Cipher rsa = Cipher.getInstance(cipherString);
rsa.init(Cipher.DECRYPT_MODE, getPrivateKeyEntry().getPrivateKey());
return new String(
rsa.doFinal(new Base64().decode(source)),
getInitializedCipher(
newCipher,
Cipher.DECRYPT_MODE,
getPrivateKeyEntry().getPrivateKey()).doFinal(new Base64().decode(source)),
StandardCharsets.UTF_8
);
}
}

private static Cipher getInitializedCipher(boolean newCipher, int mode, Key key) throws GeneralSecurityException {
Cipher cipher = null;
if (newCipher) {
cipher = Cipher.getInstance("RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING");
// By default Oracle standard security provider uses MFG1 instantiated with SHA-1, SHA-256 is used only
// for the label, so we need to enforce using SHA-256
OAEPParameterSpec oaepParameterSpec = new OAEPParameterSpec("SHA-256", "MGF1",
MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
cipher.init(mode, key, oaepParameterSpec);
} else {
cipher = Cipher.getInstance("RSA");
cipher.init(mode, key);
}
return cipher;
}

/**
* Return key managers.
* @return array of key managers.
Expand Down