From d60751f0a5111668a50453b449ef506e8035df2a Mon Sep 17 00:00:00 2001
From: Victor Salaman <vsalaman@vmantek.com>
Date: Thu, 19 Feb 2015 12:03:52 -0500
Subject: [PATCH] Provides missing signatures removed by previous commit.

---
 .../java/org/jpos/security/BaseSMAdapter.java | 46 ++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/jpos/src/main/java/org/jpos/security/BaseSMAdapter.java b/jpos/src/main/java/org/jpos/security/BaseSMAdapter.java
index 2b4cb3c062..51b9886fc9 100644
--- a/jpos/src/main/java/org/jpos/security/BaseSMAdapter.java
+++ b/jpos/src/main/java/org/jpos/security/BaseSMAdapter.java
@@ -816,7 +816,7 @@ public boolean verifyCVC3(SecureDESKey imkcvc3, String accountNo, String acctSeq
       LogEvent evt = new LogEvent(this, "s-m-operation");
       evt.addMessage(new SimpleMsg("command", "Verify CVC3", cmdParameters));
       try {
-        boolean r = verifyCVC3Impl( imkcvc3, accountNo, acctSeqNo, atc, upn, data, mkdm, cvc3);
+        boolean r = verifyCVC3Impl(imkcvc3, accountNo, acctSeqNo, atc, upn, data, mkdm, cvc3);
         evt.addMessage(new SimpleMsg("result", "Verification status", r ? "valid" : "invalid"));
         return r;
       } catch (Exception e) {
@@ -846,7 +846,7 @@ public boolean verifyARQC(MKDMethod mkdm, SKDMethod skdm, SecureDESKey imkac
       LogEvent evt = new LogEvent(this, "s-m-operation");
       evt.addMessage(new SimpleMsg("command", "Verify ARQC/TC/AAC", cmdParameters));
       try {
-        boolean r = verifyARQCImpl( mkdm, skdm, imkac, accoutNo, acctSeqNo, arqc, atc, upn, transData);
+        boolean r = verifyARQCImpl(mkdm, skdm, imkac, accoutNo, acctSeqNo, arqc, atc, upn, transData);
         evt.addMessage(new SimpleMsg("result", "Verification status", r ? "valid" : "invalid"));
         return r;
       } catch (Exception e) {
@@ -880,8 +880,8 @@ public byte[] generateARPC(MKDMethod mkdm, SKDMethod skdm, SecureDESKey imkac
       LogEvent evt = new LogEvent(this, "s-m-operation");
       evt.addMessage(new SimpleMsg("command", "Genarate ARPC", cmdParameters));
       try {
-        byte[] result = generateARPCImpl( mkdm, skdm, imkac, accoutNo, acctSeqNo
-                           ,arqc, atc, upn, arpcMethod, arc, propAuthData );
+        byte[] result = generateARPCImpl(mkdm, skdm, imkac, accoutNo, acctSeqNo
+            , arqc, atc, upn, arpcMethod, arc, propAuthData);
         evt.addMessage(new SimpleMsg("result", "Generated ARPC", result));
         return result;
       } catch (Exception e) {
@@ -916,8 +916,8 @@ public byte[] verifyARQCGenerateARPC(MKDMethod mkdm, SKDMethod skdm, SecureDESKe
       LogEvent evt = new LogEvent(this, "s-m-operation");
       evt.addMessage(new SimpleMsg("command", "Genarate ARPC", cmdParameters));
       try {
-        byte[] result = verifyARQCGenerateARPCImpl( mkdm, skdm, imkac, accoutNo,
-                acctSeqNo, arqc, atc, upn, transData, arpcMethod, arc, propAuthData );
+        byte[] result = verifyARQCGenerateARPCImpl(mkdm, skdm, imkac, accoutNo,
+                                                   acctSeqNo, arqc, atc, upn, transData, arpcMethod, arc, propAuthData);
         evt.addMessage(new SimpleMsg("result", "ARPC", result == null ? "" : ISOUtil.hexString(result)));
         return result;
       } catch (Exception e) {
@@ -946,7 +946,7 @@ public byte[] generateSM_MAC(MKDMethod mkdm, SKDMethod skdm
       LogEvent evt = new LogEvent(this, "s-m-operation");
       evt.addMessage(new SimpleMsg("command", "Generate Secure Messaging MAC", cmdParameters));
       try {
-        byte[] mac = generateSM_MACImpl( mkdm, skdm, imksmi, accountNo, acctSeqNo, atc, arqc, data);
+        byte[] mac = generateSM_MACImpl(mkdm, skdm, imksmi, accountNo, acctSeqNo, atc, arqc, data);
         evt.addMessage(new SimpleMsg("result", "Generated MAC", mac!=null ? ISOUtil.hexString(mac) : ""));
         return mac;
       } catch (Exception e) {
@@ -1177,23 +1177,55 @@ protected EncryptedPIN translatePINImpl (EncryptedPIN pinUnderKd1, SecureDESKey
 
     /**
      * Your SMAdapter should override this method if it has this functionality
+     * @deprecated
      * @param pinUnderDuk
      * @param ksn
      * @param bdk
      * @return imported pin
      * @throws SMException
      */
+    protected EncryptedPIN importPINImpl (EncryptedPIN pinUnderDuk, KeySerialNumber ksn,
+            SecureDESKey bdk) throws SMException {
+        return importPINImpl(pinUnderDuk,ksn,bdk,false);
+    }
+
+    /**
+     * Your SMAdapter should override this method if it has this functionality
+     * @param pinUnderDuk
+     * @param ksn
+     * @param bdk
+     * @param tdes
+     * @return imported pin
+     * @throws SMException
+     */
     protected EncryptedPIN importPINImpl (EncryptedPIN pinUnderDuk, KeySerialNumber ksn,
             SecureDESKey bdk, boolean tdes) throws SMException {
         throw  new SMException("Operation not supported in: " + this.getClass().getName());
     }
 
+    /**
+     * Your SMAdapter should override this method if it has this functionality
+     * @deprecated
+     * @param pinUnderDuk
+     * @param ksn
+     * @param bdk
+     * @param kd2
+     * @param destinationPINBlockFormat
+     * @return translated pin
+     * @throws SMException
+     */
+    protected EncryptedPIN translatePINImpl (EncryptedPIN pinUnderDuk, KeySerialNumber ksn,
+            SecureDESKey bdk, SecureDESKey kd2, byte destinationPINBlockFormat) throws SMException {
+        return translatePINImpl(pinUnderDuk,ksn,bdk,kd2,destinationPINBlockFormat,false);
+    }
+
     /**
      * Your SMAdapter should override this method if it has this functionality
      * @param pinUnderDuk
      * @param ksn
      * @param bdk
      * @param kd2
+     * @param tdes
      * @param destinationPINBlockFormat
      * @return translated pin
      * @throws SMException