Take care of strtok bugs

1 files changed, 42 insertions, 19 deletions

diff --git a/src/engine_pkcs11.c b/src/engine_pkcs11.c
index 41d24ce..0301ec7 100644
--- a/src/engine_pkcs11.c
+++ b/src/engine_pkcs11.c
@@ -816,9 +816,12 @@ static EVP_PKEY *pkcs11_load_key
                                         k->isPrivate ? 'P' : ' ',
                                         k->needLogin ? 'L' : ' ', k->label);
                         }
+
+                        if (!!isPrivate != !!(k->isPrivate)) continue;
+
                         if (key_label == NULL) {
                                 if (key_id_len != 0 && k->id_len == key_id_len
-                                    && memcmp(k->id, key_id, key_id_len) == 0) {
+                                    && (memcmp(k->id, key_id, key_id_len) == 0)) {
                                         selected_key = k;
                                 }
                         } else {
@@ -1292,17 +1295,21 @@ static int parse_cert_store_string
 {
         char *token;
         const char *sep = ":";
-        char *str = (char *)cert_store_str;
+        char *str, *lasts;
 
         if (!cert_store_str)
                 return -1;
 
+        str = strdup(cert_store_str);
+        if (str == NULL)
+                return -1;
+
         /* Default values */
         *slot = 0;
         *label = NULL;
         *cert_file = NULL;
 
-        token = strtok(str, sep);
+        token = strtok_r(str, sep, &lasts);
 
         while (token) {
 
@@ -1336,7 +1343,7 @@ static int parse_cert_store_string
                                 return -1;
                         }
                 }
-                token = strtok(NULL, sep);
+                token = strtok_r(NULL, sep, &lasts);
         } /* end while(token) */
 
         if (*cert_file == NULL) {
@@ -1406,17 +1413,21 @@ static int parse_key_gen_string
 {
         char *token;
         const char *sep = ":";
-        char *str = (char *)key_gen_str;
+        char *str, *lasts;
 
         if (!key_gen_str)
                 return -1;
 
+        str = strdup(key_gen_str);
+        if (str == NULL)
+                return -1;
+
         /* Default values */
         *slot = 0;
         *label = NULL;
         *key_size = -1;
 
-        token = strtok(str, sep);
+        token = strtok_r(str, sep, &lasts);
 
         while (token) {
 
@@ -1449,7 +1460,7 @@ static int parse_key_gen_string
                                 return -1;
                         }
                 }
-                token = strtok(NULL, sep);
+                token = strtok_r(NULL, sep, &lasts);
         } /* end while(token) */
 
         if (*key_size == -1) {
@@ -1629,17 +1640,21 @@ static int parse_del_obj_string
 {
         char *token;
         const char *sep = ":";
-        char *str = (char *)del_obj_str;
+        char *str, *lasts;
 
         if (!del_obj_str)
                 return -1;
 
+        str = strdup(del_obj_str);
+        if (str == NULL)
+                return -1;
+
         /* Default values */
         *slot = 0;
         *label = NULL;
         *type = NULL;
 
-        token = strtok(str, sep);
+        token = strtok_r(str, sep, &lasts);
 
         while (token) {
 
@@ -1673,7 +1688,7 @@ static int parse_del_obj_string
                                 return -1;
                         }
                 }
-                token = strtok(NULL, sep);
+                token = strtok_r(NULL, sep, &lasts);
         } /* end while(token) */
 
         if (*type == NULL) {
@@ -1931,17 +1946,21 @@ static int parse_key_string
 {
         char *token;
         const char *sep = ":";
-        char *str = (char *)key_get_str;
+        char *str, *lasts;
 
         if (!key_get_str)
                 return -1;
 
+        str = strdup(key_get_str);
+        if (str == NULL)
+                return -1;
+
         /* Default values */
         *slot = 0;
         *label = NULL;
-        *key_file = NULL;
+        if (key_file) *key_file = NULL;
 
-        token = strtok(str, sep);
+        token = strtok_r(str, sep, &lasts);
 
         while (token) {
 
@@ -1950,14 +1969,14 @@ static int parse_key_string
                         /* slot is a decimal number */
                         if (sscanf(token + 5, "%d", slot) != 1) {
                                 fprintf(stderr, "slot number not deciphered!\n");
-                                return -1;
+                                goto err;
                         }
                 } else if (!strncmp(token, "id_", 3)) {
                         /* certificate ID */
                         /* id is hexadecimal number */
                         if (!hex_to_bin(token + 3, id, id_len)) {
                                 fprintf(stderr, "id not deciphered!\n");
-                                return -1;
+                                goto err;
                         }
                 } else if (!strncmp(token, "label_", 6)) {
                         /* label */
@@ -1965,24 +1984,28 @@ static int parse_key_string
                         *label = strdup(token + 6);
                         if (*label == NULL) {
                                 fprintf(stderr, "label not deciphered!\n");
-                                return -1;
+                                goto err;
                         }
                 } else if ((key_file) && (!strncmp(token, "key_", 4))) {
                         /* key file name */
                         *key_file = strdup(token + 4);
                         if (*key_file == NULL) {
                                 fprintf(stderr, "key file not deciphered!\n");
-                                return -1;
+                                goto err;
                         }
                 }
-                token = strtok(NULL, sep);
+                token = strtok_r(NULL, sep, &lasts);
         } /* end while(token) */
 
         if ((key_file) && (*key_file == NULL)) {
                 fprintf(stderr, "key file name not present!\n");
-                return -1;
+                goto err;
         }
 
         return 0;
+
+err:
+        free(str);
+        return -1;
 }