sign_params_to_flags: moved to certtool-common.c

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

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 71de7cf61d6cee7c6e5787c2b81e8c17cb014139..4d20ecff98ccd351b3b3d7d118d3831b9b3fa2bc 100644 (file)
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -1587,3 +1587,29 @@ gnutls_digest_algorithm_t hash_to_id(const char *hash)
                return gnutls_digest_get_id(hash);
        }
 }
+
+void sign_params_to_flags(common_info_st *cinfo, const char *params)
+{
+       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, ",");
+       }
+
+       free(sp);
+}

diff --git a/src/certtool-common.h b/src/certtool-common.h
index 1b9255cf5563105c41ae373670d59ef9ba6a58cb..ee07f133c8b55c5dc7306d48edcd77ef92bf0169 100644 (file)
--- a/src/certtool-common.h
+++ b/src/certtool-common.h
@@ -65,6 +65,7 @@ typedef struct common_info {
        const char *pin;
        const char *so_pin;
 
+       gnutls_digest_algorithm_t hash;
        int cprint;
        unsigned key_usage;
 
@@ -176,4 +177,6 @@ gnutls_pk_algorithm_t figure_key_type(const char *key_type);
 
 gnutls_digest_algorithm_t hash_to_id(const char *hash);
 
+void sign_params_to_flags(common_info_st *cinfo, const char *params);
+
 #endif

diff --git a/src/certtool.c b/src/certtool.c
index a8502ec5647dea4564c0b75321391f141bccdf44..f06a458929a0cd5f1247367b2ffafbb0547cab01 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1130,33 +1130,6 @@ static void update_signed_certificate(common_info_st * cinfo)
        gnutls_x509_crt_deinit(crt);
 }
 
-static
-void sign_params_to_flags(common_info_st *cinfo, const char *params)
-{
-       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, ",");
-       }
-
-       free(sp);
-}
-
 static void load_infile(const char *file)
 {
        struct stat st;