Ensuring OAEP is used with RSA.

Author: thesquaregroot

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri May 15 17:54:33 EDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

src/main/java/com/softwareverde/security/rsa/BouncyCastleRsaKeys.java

@@ -11,7 +11,7 @@
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.Signer;
 import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
+import org.bouncycastle.crypto.encodings.OAEPEncoding;
 import org.bouncycastle.crypto.engines.RSAEngine;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.RSAKeyParameters;
@@ -65,7 +65,7 @@ public BouncyCastleRsaKeys(final PGPPublicKey publicKey, final PGPPrivateKey pri
             throw new RuntimeException("Unable to store private key information", exception);
         }
 
-        _cipher = new PKCS1Encoding(new RSAEngine());
+        _cipher = new OAEPEncoding(new RSAEngine());
         _signer = new RSADigestSigner(new SHA256Digest());
     }
 
@@ -82,7 +82,7 @@ public BouncyCastleRsaKeys(final byte[] publicKey, final byte[] privateKey, fina
             throw new IOException("Unable to convert keys", exception);
         }
 
-        _cipher = new PKCS1Encoding(new RSAEngine());
+        _cipher = new OAEPEncoding(new RSAEngine());
         _signer = new RSADigestSigner(new SHA256Digest());
     }
 
@@ -156,7 +156,7 @@ public static byte[] encryptWithPublicKey(final PGPPublicKey publicKey, final by
 
         try {
             AsymmetricKeyParameter underlyingPublicKey = _createPublicKey(publicKey);
-            AsymmetricBlockCipher cipher = new PKCS1Encoding(new RSAEngine());
+            AsymmetricBlockCipher cipher = new OAEPEncoding(new RSAEngine());
 
             cipher.init(true, underlyingPublicKey);
             return cipher.processBlock(plainText, 0, plainText.length);