ap

miyako · Dec 10, 2024 · b3336f1 · b3336f1
1 parent 494599f
commit b3336f1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 107 deletions.
diff --git a/docs/HPKI対応ICカードガイドラインV3.0 原案 .pdf b/docs/HPKI対応ICカードガイドラインV3.0 原案 .pdf
diff --git a/hpki/Resources/bin/macOS/hpki b/hpki/Resources/bin/macOS/hpki
diff --git a/include/My-Number-Card_macOS.cpp b/include/My-Number-Card_macOS.cpp
@@ -684,10 +684,10 @@ static void _apdu_select_app_hpki_compute_digital_signature(dispatch_semaphore_t
     [smartCard beginSessionWithReply:^(BOOL _success, NSError *error) {
         if (_success) {
 
-            std::string hex = APDU_SELECT_IDENTITY_AP_HPKI;//署名用APではない
+            std::string hex = APDU_SELECT_SIGNATURE_AP_HPKI;
             std::vector<uint8_t>buf(0);
             hex_to_bytes(hex, buf);
-            
+
             std::vector<uint8_t>data(sizeof(APDU_SELECT_FILE_DF) + buf.size());
             memcpy(&data[0],
                    APDU_SELECT_FILE_DF,

diff --git a/include/My-Number-Card_windows.cpp b/include/My-Number-Card_windows.cpp
@@ -1184,7 +1184,7 @@ static void _apdu_select_pin_hpki_compute_digital_signature_identity(SCARDHANDLE
 
 static void _apdu_select_app_hpki_compute_digital_signature_identity(SCARDHANDLE hCard, const SCARD_IO_REQUEST* pioSendPci, Json::Value& threadCtx) {
 
-    std::string hex = APDU_SELECT_IDENTITY_AP_HPKI;
+    std::string hex = APDU_SELECT_SIGNATURE_AP_HPKI;
     std::vector<uint8_t>buf(0);
     hex_to_bytes(hex, buf);
 

diff --git a/macOS/hpki.xcodeproj/xcuserdata/miyako.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/macOS/hpki.xcodeproj/xcuserdata/miyako.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -7,87 +7,39 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "1644B1FF-CAD3-4F82-B99D-AEA4A691AAE4"
+            uuid = "41259036-3FF9-48C0-9725-3129D0A3A6F2"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../include/My-Number-Card_macOS.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1022"
-            endingLineNumber = "1022"
-            landmarkName = "_apdu_select_app_hpki_cert_identity(sem, smartCard, threadCtx)"
+            startingLineNumber = "687"
+            endingLineNumber = "687"
+            landmarkName = "_apdu_select_app_hpki_compute_digital_signature(sem, smartCard, threadCtx)"
             landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "E8A70532-C5C4-4B74-A91D-774B7E9B4ED3"
+            uuid = "C7D88223-E3D4-4FB4-98D4-111D33B0AFD4"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../include/My-Number-Card_macOS.cpp"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "619"
-            endingLineNumber = "619"
-            landmarkName = "_apdu_select_app_jpki_compute_digital_signature(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3B31CD1D-0991-4254-A19F-D5F47EB71D90"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1000"
-            endingLineNumber = "1000"
-            landmarkName = "_apdu_select_hpki_cert_signature(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "9710A533-64F5-4ED9-ADC1-A9F675400EEB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "360"
-            endingLineNumber = "360"
-            landmarkName = "_apdu_verify_app_hpki_compute_digital_signature_identity(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "818AD0B1-35F9-4D00-A5F3-4626278E46CB"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
+            startingLineNumber = "310"
+            endingLineNumber = "310"
             landmarkName = "_apdu_set_security_environment_hpki_signature(sem, smartCard, threadCtx)"
             landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "F513F85D-7602-42BC-BE4F-AC977BFDBD28"
+            uuid = "B6B755F4-B916-4EFD-BAB7-CBEB3C665237"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -100,53 +52,5 @@
             landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C2285204-460C-4EC8-8A07-42615EE989BC"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "673"
-            endingLineNumber = "673"
-            landmarkName = "_apdu_select_pin_hpki_compute_digital_signature(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "3D70BE16-A47F-4564-B018-948E5F03DED0"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "332"
-            endingLineNumber = "332"
-            landmarkName = "_apdu_select_hpki_key_signature(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5683F402-D93B-441D-921D-127F8E6741A8"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../include/My-Number-Card_macOS.cpp"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "310"
-            endingLineNumber = "310"
-            landmarkName = "_apdu_set_security_environment_hpki_signature(sem, smartCard, threadCtx)"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/pcsc-tools/pcsc_scan b/pcsc-tools/pcsc_scan
diff --git a/pcsc-tools/pcsc_scan.dmg b/pcsc-tools/pcsc_scan.dmg