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

adjusted to changes of OpenPACE

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@438 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-07-26 11:17:20 +00:00
parent 3fe52398ed
commit 14fb0aefe9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
npa/src/npa.c
View File

@@ -928,6 +928,7 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
PACE_SEC *sec = NULL; PACE_SEC *sec = NULL;
CVC_CHAT *chat = NULL; CVC_CHAT *chat = NULL;
BIO *bio_stdout = NULL; BIO *bio_stdout = NULL;
CVC_CERTIFICATE_DESCRIPTION *desc = NULL;
int r; int r;
if (!card) if (!card)
@@ -940,6 +941,14 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
if (pace_input.certificate_description_length && if (pace_input.certificate_description_length &&
pace_input.certificate_description) { pace_input.certificate_description) {
if (!d2i_CVC_CERTIFICATE_DESCRIPTION(&desc,
&pace_input.certificate_description,
pace_input.certificate_description_length)) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not parse certificate description.");
r = SC_ERROR_INTERNAL;
goto err;
}
if (!bio_stdout) if (!bio_stdout)
bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE); bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
if (!bio_stdout) { if (!bio_stdout) {
@@ -950,9 +959,7 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
} }
printf("Certificate Description\n"); printf("Certificate Description\n");
switch(certificate_description_print(bio_stdout, switch(certificate_description_print(bio_stdout, desc, 8)) {
pace_input.certificate_description,
pace_input.certificate_description_length, "\t")) {
case -1: case -1:
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not print certificate description."); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not print certificate description.");
ssl_error(card->ctx); ssl_error(card->ctx);
@@ -1018,7 +1025,7 @@ int EstablishPACEChannel(struct sm_ctx *oldnpactx, sc_card_t *card,
} }
printf("Card holder authorization template (CHAT)\n"); printf("Card holder authorization template (CHAT)\n");
if (!cvc_chat_print(bio_stdout, chat, "\t")) { if (!cvc_chat_print(bio_stdout, chat, 8)) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not print card holder authorization template (CHAT)."); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not print card holder authorization template (CHAT).");
ssl_error(card->ctx); ssl_error(card->ctx);
r = SC_ERROR_INTERNAL; r = SC_ERROR_INTERNAL;