diff --git a/cardlib/src/main/java/gov/gsa/pivconformance/card/client/PIVDataObject.java b/cardlib/src/main/java/gov/gsa/pivconformance/card/client/PIVDataObject.java index 8ba0eb73..6048e431 100644 --- a/cardlib/src/main/java/gov/gsa/pivconformance/card/client/PIVDataObject.java +++ b/cardlib/src/main/java/gov/gsa/pivconformance/card/client/PIVDataObject.java @@ -223,6 +223,7 @@ public void dump(Class classz) { Logger s_containerLogger = LoggerFactory.getLogger(className); s_containerLogger.debug("Container: {}", APDUConstants.oidNameMap.get(m_OID).replace(" ", "_")); + s_containerLogger.debug("Raw bytes: {}", Hex.encodeHexString(m_dataBytes)); for (int i = 0; i < m_tagList.size(); i++) { BerTag tag = m_tagList.get(i); if (tag == null) { diff --git a/cardlib/src/main/java/gov/gsa/pivconformance/card/client/SecurityObject.java b/cardlib/src/main/java/gov/gsa/pivconformance/card/client/SecurityObject.java index e811a291..6ab8493d 100644 --- a/cardlib/src/main/java/gov/gsa/pivconformance/card/client/SecurityObject.java +++ b/cardlib/src/main/java/gov/gsa/pivconformance/card/client/SecurityObject.java @@ -317,9 +317,12 @@ public boolean verifyHashes() { LDSSecurityObject ldsso = null; try { signedData = new CMSSignedData(m_so); - ldsso = LDSSecurityObject.getInstance(signedData.getSignedContent().getContent()); + ASN1Sequence seq = ASN1Sequence.getInstance(signedData.getSignedContent().getContent()); + ldsso = LDSSecurityObject.getInstance(seq); } catch (CMSException ex) { - s_logger.error("Unable to create CMSSignedData object from Security Object data."); + s_logger.error("CMSException: " + ex.getMessage()); + } catch (Exception ex) { + s_logger.error(ex.getMessage()); } if (ldsso != null) { diff --git a/conformancelib/src/main/java/gov/gsa/conformancelib/configuration/CardSettingsSingleton.java b/conformancelib/src/main/java/gov/gsa/conformancelib/configuration/CardSettingsSingleton.java index 4a88c10e..d2aadf0a 100644 --- a/conformancelib/src/main/java/gov/gsa/conformancelib/configuration/CardSettingsSingleton.java +++ b/conformancelib/src/main/java/gov/gsa/conformancelib/configuration/CardSettingsSingleton.java @@ -33,6 +33,14 @@ public void setGlobalPin(String globalPin) { m_globalPin = globalPin; } + public String getAtr() { + return m_atr; + } + + public void setAtr(String atr) { + m_atr = atr; + } + public CardTerminal getTerminal() { return m_terminal; } @@ -73,6 +81,7 @@ public enum LOGIN_STATUS { private String m_applicationPin = null; private String m_globalPin = null; + private String m_atr = null; private CardTerminal m_terminal = null; private CardHandle m_cardHandle = null; @@ -94,11 +103,10 @@ public void reset() { m_readerIndex = -1; m_applicationPin = null; m_globalPin = null; + m_atr = null; m_terminal = null; m_pivHandle = null; m_cardHandle = null; m_lastLoginStatus = LOGIN_STATUS.LOGIN_NOT_TRIED; } - - } diff --git a/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/GuiRunnerApplication.java b/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/GuiRunnerApplication.java index 450ece0b..52ae72af 100644 --- a/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/GuiRunnerApplication.java +++ b/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/GuiRunnerApplication.java @@ -25,7 +25,7 @@ public class GuiRunnerApplication { private static final org.slf4j.Logger s_logger = LoggerFactory.getLogger(GuiRunnerApplication.class); - private static final String cctVersion = "v0.1.8-Beta"; + private static final String cctVersion = "v0.1.10-Beta"; private JFrame m_mainFrame; private DebugWindow m_debugFrame; diff --git a/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/SimpleTestExecutionPanel.java b/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/SimpleTestExecutionPanel.java index 7ff6d6c7..e14b7eb0 100644 --- a/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/SimpleTestExecutionPanel.java +++ b/tools/85b-swing-gui/src/main/java/gov/gsa/pivconformancegui/SimpleTestExecutionPanel.java @@ -402,7 +402,9 @@ public void refreshReaderStatus(CardSettingsSingleton css) { byte[] atr = CardInfoController.getATR(); if(atr != null) { String hexAtr = Hex.encodeHexString(atr); - status = "Card present: " + hexAtr; + status = "ATR: " + hexAtr; + s_logger.debug(status); + css.setAtr(hexAtr); } else { status = "Unable to connect to card"; }