VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

generating cv certificate from apdu data to perform check against certificate description

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@535 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-09-21 22:08:52 +00:00
parent a75ae8a2bd
commit 62d8b637ab
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
npa/src/npa.c
View File

@@ -1498,6 +1498,40 @@ err:
return r; return r;
} }
static CVC_CERT *
cert_from_apdudata(const unsigned char *data, size_t len)
{
/* there MUST be a more elegant way to do this... */
CVC_CERT *cert;
long int asn1datalen;
int tag, xclass;
const unsigned char *p = data;
cert = CVC_CERT_new();
if (!cert)
goto err;
if (0x80 & ASN1_get_object(&p, &asn1datalen, &tag, &xclass, len)
|| !d2i_CVC_CERT_BODY(&cert->body, &data, (data-p)+asn1datalen))
goto err;
p += len;
if (0x80 & ASN1_get_object(&p, &asn1datalen, &tag, &xclass, len-(data-p))
|| tag != 0x37)
goto err;
cert->signature = ASN1_OCTET_STRING_new();
if (!cert->signature
|| !ASN1_OCTET_STRING_set(cert->signature, p, asn1datalen))
goto err;
return cert;
err:
if (cert)
CVC_CERT_free(cert);
return NULL;
}
static int static int
npa_sm_pre_transmit(sc_card_t *card, const struct sm_ctx *ctx, npa_sm_pre_transmit(sc_card_t *card, const struct sm_ctx *ctx,
sc_apdu_t *apdu) sc_apdu_t *apdu)
@@ -1505,16 +1539,18 @@ npa_sm_pre_transmit(sc_card_t *card, const struct sm_ctx *ctx,
if (apdu && apdu->ins == 0x2a && apdu->p1 == 0x00 && apdu->p2 == 0xbe) { if (apdu && apdu->ins == 0x2a && apdu->p1 == 0x00 && apdu->p2 == 0xbe) {
/* PSO:Verify Certificate /* PSO:Verify Certificate
* check certificate description to match given certificate */ * check certificate description to match given certificate */
CVC_CERT *cvc_cert = NULL;
struct npa_sm_ctx *eacsmctx = ctx->priv_data; struct npa_sm_ctx *eacsmctx = ctx->priv_data;
CVC_CERT *cvc_cert = cert_from_apdudata(apdu->data, apdu->datalen);
cvc_cert = CVC_d2i_CVC_CERT(NULL, &apdu->data, apdu->datalen);
if (!eacsmctx || !cvc_cert if (!eacsmctx || !cvc_cert
|| !CVC_check_cert(cvc_cert, eacsmctx->certificate_description, || !CVC_check_cert(cvc_cert, eacsmctx->certificate_description,
eacsmctx->certificate_description_length)) { eacsmctx->certificate_description_length)) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Certificate Description doesn't match Certificate"); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Certificate Description doesn't match Certificate");
if (cvc_cert)
CVC_CERT_free(cvc_cert);
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, SC_ERROR_INVALID_DATA); SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, SC_ERROR_INVALID_DATA);
} }
CVC_CERT_free(cvc_cert);
} }
SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL,