From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 26 Jul 2017 14:45:00 +0000 (+0200)
Subject: certtool: sign_params_to_flags: use strtok to parse input
X-Git-Tag: gnutls_3_6_0~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec6ea4e696bf3222b76645433c3de8a67ce645bf;p=thirdparty%2Fgnutls.git

certtool: sign_params_to_flags: use strtok to parse input

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/src/certtool.c b/src/certtool.c
index 906ab9f500..4e4f3277f3 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1115,13 +1115,28 @@ static void update_signed_certificate(common_info_st * cinfo)
 static
 void sign_params_to_flags(common_info_st *cinfo, const char *params)
 {
-	if (strcasecmp(params, "rsa-pss") == 0) {
-		cinfo->rsa_pss_sign = 1;
-		return;
+	char *p, *sp;
+
+	sp = strdup(params);
+	if (sp == NULL) {
+		fprintf(stderr, "memory error\n");
+		app_exit(1);
+	}
+
+	p = strtok(sp, ",");
+
+	while(p != NULL) {
+		if (strcasecmp(p, "rsa-pss")==0) {
+			cinfo->rsa_pss_sign = 1;
+		} else {
+			fprintf(stderr, "Unknown signature parameter: %s\n", p);
+			app_exit(1);
+		}
+
+		p=strtok(NULL, ",");
 	}
 
-	fprintf(stderr, "Unknown signature parameters: %s\n", params);
-	app_exit(1);
+	free(sp);
 }
 
 static void figure_key_type(const char *key_type)