- using short apdus for mse:set at and generic authenticate. to make it work with the sm implementation

- added parameter oldpacectx to EstablishPACEChannel to allow a a new PACE connection inside an exitsting PACE connection (the output buffer of the latter connection must be provided since it stores the ef.cardaccess)
- added functionality to ask for the secret in pace_reset_retry_counter
- added macro pace_change_pin
- SWs were stored at the wrong place of the output buffer from EstablishPACEChannel, fixed.
- split up functionality of pace_test into multiple functions
- added new command line option to pace-tool to resume the pin. resuming the pin is not working, yet.


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@108 96b47cad-a561-4643-ad3b-153ac7d7599c

ccid/src/sm.c

@@ -257,7 +257,7 @@ static int sm_encrypt(const struct sm_ctx *ctx, sc_card_t *card,
 
     if ((apdu->cla & 0x0C) == 0x0C) {
         r = SC_ERROR_INVALID_ARGUMENTS;
-        sc_error(card->ctx, "Given APDU is already protected with some secure messaging.");
+        sc_error(card->ctx, "Given APDU is already protected with some secure messaging");
         goto err;
     }
 
@@ -561,13 +561,13 @@ int sm_transmit_apdu(const struct sm_ctx *sctx, sc_card_t *card,
     sm_apdu.resplen = sizeof rbuf;
 
     SC_TEST_RET(card->ctx, sm_encrypt(sctx, card, apdu, &sm_apdu),
-            "Could not encrypt APDU.");
+            "Could not encrypt APDU");
     SC_TEST_RET(card->ctx, sc_transmit_apdu(card, &sm_apdu),
-            "Could not transmit SM APDU.");
+            "Could not transmit SM APDU");
     SC_TEST_RET(card->ctx, sm_decrypt(sctx, card, &sm_apdu, apdu),
-            "Could not decrypt APDU.");
+            "Could not decrypt APDU");
     SC_TEST_RET(card->ctx, sc_check_sw(card, apdu->sw1, apdu->sw2),
-            "Card returned error.");
+            "Card returned error");
 
     SC_FUNC_RETURN(card->ctx, SC_LOG_TYPE_ERROR, SC_SUCCESS);
 }