giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use strlcpy(3), strlcat(3) in pkcs15-itacns.c 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4635 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
ep 2010-08-18 13:42:30 +00:00
parent b279287701
commit d37dd91b63
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libopensc/pkcs15-itacns.c
View File

@ -38,6 +38,7 @@
#include <string.h>
#include <stdio.h>
#include "common/compat_strlcpy.h"
#include "common/compat_strlcat.h"
#ifdef ENABLE_OPENSSL
#include <openssl/x509v3.h>
@ -536,25 +537,20 @@ static int itacns_add_keyset(sc_pkcs15_card_t *p15card,
/* PIN and PUK */
char pinlabel[16];
{
const char PIN[] = "PIN ";
strcpy(pinlabel, PIN);
strncat(pinlabel, label, sizeof(pinlabel)-sizeof(PIN)-1);
}
strlcpy(pinlabel, "PIN ", sizeof(pinlabel));
strlcat(pinlabel, label, sizeof(pinlabel));
/* We are making up ID 0x90+ to link the PIN and the PUK. */
int fake_puk_authid = 0x90 + pin_ref;
int pin_flags = SC_PKCS15_PIN_FLAG_CASE_SENSITIVE
| SC_PKCS15_PIN_FLAG_INITIALIZED;
r = itacns_add_pin(p15card, pinlabel, sec_env, fake_puk_authid, pin_ref,
private_path, pin_flags);
SC_TEST_RET(p15card->card->ctx, SC_LOG_DEBUG_NORMAL, r,
"Could not add PIN");
{
const char PUK[] = "PUK ";
strcpy(pinlabel, PUK);
strncat(pinlabel, label, sizeof(pinlabel)-sizeof(PUK)-1);
}
strlcpy(pinlabel, "PUK ", sizeof(pinlabel));
strlcat(pinlabel, label, sizeof(pinlabel));
/*
* Looking at pkcs15-tcos.c and pkcs15-framework.c, it seems that the
* right thing to do here is to define a PUK as a SO PIN. Can anybody