Fix errors

Author: KostasTsiounis

src/main/java/com/ibm/crypto/plus/provider/ock/NativeOCKAdapter.java

@@ -665,10 +665,11 @@ public void do_CCM_delete() throws OCKException {
     }
 
     @Override
-    public int RSACIPHER_public_encrypt(long rsaKeyId, int rsaPaddingId, byte[] plaintext, int plaintextOffset,
+    public int RSACIPHER_public_encrypt(long rsaKeyId,
+            int rsaPaddingId, int mdId, int mgf1Id, byte[] plaintext, int plaintextOffset,
             int plaintextLen, byte[] ciphertext, int ciphertextOffset) throws OCKException {
         return NativeOCKImplementation.RSACIPHER_public_encrypt(ockContext.getId(), rsaKeyId, rsaPaddingId,
-            plaintext, plaintextOffset, plaintextLen, ciphertext, ciphertextOffset);
+            mdId, mgf1Id, plaintext, plaintextOffset, plaintextLen, ciphertext, ciphertextOffset);
     }
 
     @Override
@@ -686,10 +687,12 @@ public int RSACIPHER_public_decrypt(long rsaKeyId, int rsaPaddingId, byte[] ciph
     }
 
     @Override
-    public int RSACIPHER_private_decrypt(long rsaKeyId, int rsaPaddingId, byte[] ciphertext, int ciphertextOffset,
-            int ciphertextLen, byte[] plaintext, int plaintextOffset, boolean convertKey) throws OCKException {
+    public int RSACIPHER_private_decrypt(long rsaKeyId,
+            int rsaPaddingId, int mdId, int mgf1Id, byte[] ciphertext, int ciphertextOffset,
+            int ciphertextLen, byte[] plaintext, int plaintextOffset, boolean convertKey)
+            throws OCKException {
         return NativeOCKImplementation.RSACIPHER_private_decrypt(ockContext.getId(), rsaKeyId, rsaPaddingId,
-            ciphertext, ciphertextOffset, ciphertextLen, plaintext, plaintextOffset, convertKey);
+            mdId, mgf1Id, ciphertext, ciphertextOffset, ciphertextLen, plaintext, plaintextOffset, convertKey);
     }
 
     @Override
@@ -772,11 +775,6 @@ public byte[] RSAKEY_getPublicKeyBytes(long rsaKeyId) throws OCKException {
         return NativeOCKImplementation.RSAKEY_getPublicKeyBytes(ockContext.getId(), rsaKeyId);
     }
 
-    @Override
-    public long RSAKEY_createPKey(long rsaKeyId) throws OCKException {
-        return NativeOCKImplementation.RSAKEY_createPKey(ockContext.getId(), rsaKeyId);
-    }
-
     @Override
     public int RSAKEY_size(long rsaKeyId) {
         return NativeOCKImplementation.RSAKEY_size(ockContext.getId(), rsaKeyId);

src/main/java/com/ibm/crypto/plus/provider/ock/NativeOCKImplementation.java

@@ -439,7 +439,7 @@ static public native int do_CCM_decrypt(long ockContextId, byte[] iv, int ivLen,
     // =========================================================================
 
     static public native int RSACIPHER_public_encrypt(long ockContextId, long rsaKeyId,
-            int rsaPaddingId, byte[] plaintext, int plaintextOffset, int plaintextLen,
+            int rsaPaddingId, int mdId, int mgf1Id, byte[] plaintext, int plaintextOffset, int plaintextLen,
             byte[] ciphertext, int ciphertextOffset) throws OCKException;
 
     static public native int RSACIPHER_private_encrypt(long ockContextId, long rsaKeyId,
@@ -451,7 +451,7 @@ static public native int RSACIPHER_public_decrypt(long ockContextId, long rsaKey
             byte[] plaintext, int plaintextOffset) throws OCKException;
 
     static public native int RSACIPHER_private_decrypt(long ockContextId, long rsaKeyId,
-            int rsaPaddingId, byte[] ciphertext, int ciphertextOffset, int ciphertextLen,
+            int rsaPaddingId, int mdId, int mgf1Id, byte[] ciphertext, int ciphertextOffset, int ciphertextLen,
             byte[] plaintext, int plaintextOffset, boolean convertKey) throws OCKException;
 
     // =========================================================================
@@ -505,9 +505,6 @@ static public native byte[] RSAKEY_getPrivateKeyBytes(long ockContextId, long rs
     static public native byte[] RSAKEY_getPublicKeyBytes(long ockContextId, long rsaKeyId)
             throws OCKException;
 
-    static public native long RSAKEY_createPKey(long ockContextId, long rsaKeyId)
-            throws OCKException;
-
     static public native int RSAKEY_size(long ockContextId, long rsaKeyId);
 
     static public native void RSAKEY_delete(long ockContextId, long rsaKeyId);