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

framework-pkcs15: fix warning 

* fix -Werror=format-truncation= warning in pkcs15_init_slot()
* do not only remove blanks from the end, but all spaces
This commit is contained in:
Peter Marschall 2018-12-08 17:38:59 +01:00 committed by Frank Morgner
parent a7a9326f35
commit 01287e393e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkcs11/framework-pkcs15.c
View File

@ -21,6 +21,7 @@
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include "libopensc/log.h"
#include "libopensc/internal.h"
#include "libopensc/asn1.h"
@ -1047,7 +1048,7 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
{
struct pkcs15_slot_data *fw_data;
struct sc_pkcs15_auth_info *pin_info = NULL;
char label[(sizeof auth->label) + 10];
char label[sizeof(auth->label) + sizeof(p15card->tokeninfo->label) + 10];
int write_protected;
scconf_block *atrblock;
@ -1091,10 +1092,11 @@ pkcs15_init_slot(struct sc_pkcs15_card *p15card, struct sc_pkcs11_slot *slot,
else {
if (auth->label[0] && strncmp(auth->label, "PIN", 4) != 0) {
/* Trim tokeninfo->label to make right parenthesis visible */
char tokeninfo_label[sizeof label];
char tokeninfo_label[sizeof(p15card->tokeninfo->label)+1];
int len;
snprintf(tokeninfo_label, sizeof(tokeninfo_label), "%s", p15card->tokeninfo->label);
for (len = strlen(tokeninfo_label) - 1; len >= 0 && tokeninfo_label[len] == ' '; len--) {
tokeninfo_label[sizeof(tokeninfo_label)-1] = '\0';
for (len = strlen(tokeninfo_label) - 1; len >= 0 && isspace(tokeninfo_label[len]); len--) {
tokeninfo_label[len] = 0;
}
snprintf(label, sizeof(label), "%.*s (%s)",