Changeset 2993 for trunk/src/libopensc/pkcs15-infocamere.c

Timestamp:

07/12/06 08:12:38 (3 years ago)

Author:

ludovic.rousseau

Message:

- use strlcpy() instead of strncpy() to always have a terminating

NUL-byte

- use sizeof(field) instead of SC_PKCS15_MAX_LABEL_SIZE-1 or equivalent as

the 3rd argument of strlcpy()

Files:

• trunk/src/libopensc/pkcs15-infocamere.c (modified) (8 diffs)

trunk/src/libopensc/pkcs15-infocamere.c

@@ -31 +31 @@
 #include <string.h>
 #include <stdio.h>
+#include "strlcpy.h"
 
 #ifdef HAVE_ZLIB_H
@@ -96 +97 @@
                 info.stored_length /= 2;
 
-        strncpy(obj.label, label, SC_PKCS15_MAX_LABEL_SIZE-1);
+        strlcpy(obj.label, label, sizeof(obj.label));
         obj.flags = obj_flags;
 
@@ -129 +130 @@
 
         obj.flags = obj_flags;
-        strncpy(obj.label, label, SC_PKCS15_MAX_LABEL_SIZE-1);
+        strlcpy(obj.label, label, sizeof(obj.label));
         if (auth_id != NULL)
                 obj.auth_id = *auth_id;
@@ -152 +153 @@
                 info.path = *path;
 
-        strncpy(obj.label, label, SC_PKCS15_MAX_LABEL_SIZE-1);
+        strlcpy(obj.label, label, sizeof(obj.label));
         obj.flags = obj_flags;
 
@@ -327 +328 @@
                 cert_info.authority = authority;
                 cert_info.path = path;
-                strncpy(cert_obj.label, authlabel, SC_PKCS15_MAX_LABEL_SIZE - 1);
+                strlcpy(cert_obj.label, authlabel, sizeof(cert_obj.label));
                 cert_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE;
 
@@ -385 +386 @@
         cert_info.authority = authority;
         cert_info.path = path;
-        strncpy(cert_obj.label, label, SC_PKCS15_MAX_LABEL_SIZE - 1);
+        strlcpy(cert_obj.label, label, sizeof(cert_obj.label));
         cert_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE;
 
@@ -420 +421 @@
                         cert_info.authority = authority;
                         cert_info.path = path;
-                        strncpy(cert_obj.label, calabel, SC_PKCS15_MAX_LABEL_SIZE - 1);
+                        strlcpy(cert_obj.label, calabel, sizeof(cert_obj.label));
                         cert_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE;
 
@@ -546 +547 @@
         cert_info.authority = (i == 2);
 
-        strncpy(cert_obj.label, certLabel, SC_PKCS15_MAX_LABEL_SIZE - 1);
+        strlcpy(cert_obj.label, certLabel, sizeof(cert_obj.label));
         cert_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE;