adapted to latest changes of openpace

works with openpace 702cf84aaa01ef5dc490d32208067a89a33102c1

npa/src/npa.c

@@ -1857,7 +1857,7 @@ int perform_chip_authentication(struct sm_ctx *ctx, sc_card_t *card)
         sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not get EF.CardSecurity.");
         goto err;
     }
-    picc_pubkey = CA_get_pubkey(ef_cardsecurity, ef_cardsecurity_len);
+    picc_pubkey = CA_get_pubkey(eacsmctx->ctx, ef_cardsecurity, ef_cardsecurity_len);
     if (!picc_pubkey) {
         sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not verify EF.CardSecurity.");
         ssl_error(card->ctx);

npa/test_vicc_with_npa-tool.sh

@@ -1,8 +1,5 @@
 #! /bin/sh
 
-ECDH_CAR=DECVCAAT00001
-DH_CAR=DETESTCVCA00003
-
 CVCA=cvca.cvcert
 DVCA=dvca.cvcert
 TERMINAL=at.cvcert
@@ -50,21 +47,9 @@ fi
 
 for KA in ecdh dh
 do
-    CAR=
-    if test $KA = ecdh
-    then
-        CAR=$ECDH_CAR
-    elif test $KA = dh
-    then
-        CAR=$DH_CAR
-    else
-        echo "CAR not found"
-        exit 1
-    fi
-
     $VICC --type nPA --ef-cardsecurity=$DATA/$KA/$SECURITY \
         --ef-cardaccess=$DATA/$KA/$ACCESS --ca-key=$DATA/$KA/$NPA_KEY \
-        --car=$CAR --cvca=$DATA/$KA/$CVCA --disable-checks &
+        --cvca=$DATA/$KA/$CVCA --disable-checks &
     VICC_PID=$!
     if test $? -ne 0
     then