diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-25 10:41:27 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2017-08-27 15:58:28 +0200 |
commit | 4ef8f85693eeb11279aa418d9ef25a79e32c27ce (patch) | |
tree | 4e9212a0987b1756c5edd89b770b9bd37680129b | |
parent | f7d29a577f38b1d36da9ca979ccbac3f7ed28e32 (diff) | |
download | gnutls-4ef8f85693eeb11279aa418d9ef25a79e32c27ce.tar.gz |
sign_params_to_flags: moved to certtool-common.c
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | src/certtool-common.c | 26 | ||||
-rw-r--r-- | src/certtool-common.h | 3 | ||||
-rw-r--r-- | src/certtool.c | 27 |
3 files changed, 29 insertions, 27 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c index 71de7cf61d..4d20ecff98 100644 --- 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 1b9255cf55..ee07f133c8 100644 --- 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 a8502ec564..f06a458929 100644 --- 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; |