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

Fixed gcc 8 compilation errors (#1353) 

The following errors occured during a compilation using gcc 8:

In function »gids_create_file.constprop«,
    inserted by »gids_save_certificate.isra.8« beicard-gids.c:1548:7:
card-gids.c:465:2: Error: »strncpy« output may be truncated copying 8 bytes from a string of length 8 [-Werror=stringop-truncation]
  strncpy(record->filename, filename, 8);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pkcs15-oberthur.c: In function »sc_pkcs15emu_oberthur_add_prvkey«:
pkcs15-oberthur.c:741:5: Error: »strncpy« output may be truncated copying 254 bytes from a string of length 254 [-Werror=stringop-truncation]
     strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1);
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Florian Bezdeka 2018-05-18 18:54:56 +02:00 committed by Frank Morgner
parent 14afdf38e3
commit af72682072
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libopensc/card-gids.c
View File

@ -33,6 +33,7 @@ Some features are undocumented like the format used to store certificates. They
#include <stdlib.h>
#include <string.h>
#include "../common/compat_strlcpy.h"
#ifdef ENABLE_OPENSSL
/* openssl only needed for card administration */
@ -462,7 +463,7 @@ static int gids_create_file(sc_card_t *card, char* directory, char* filename) {
memset(masterfilebuffer + offset, 0, sizeof(gids_mf_record_t));
record = (gids_mf_record_t*) (masterfilebuffer + offset);
strncpy(record->directory, directory, 8);
strncpy(record->filename, filename, 8);
strlcpy(record->filename, filename, sizeof(record->filename));
record->fileIdentifier = fileIdentifier;
record->dataObjectIdentifier = dataObjectIdentifier;

3
src/libopensc/pkcs15-oberthur.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "../common/compat_strlcpy.h"
#include "pkcs15.h"
#include "log.h"
@ -738,7 +739,7 @@ sc_pkcs15emu_oberthur_add_prvkey(struct sc_pkcs15_card *p15card,
unsigned int id = path.value[path.len - 2] * 0x100 + path.value[path.len - 1];
if (id == ccont.id_cert) {
strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1);
strlcpy(kobj.label, objs[ii]->label, sizeof(kobj.label));
break;
}
}