diff options
author | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
---|---|---|
committer | Daiki Ueno <ueno@gnu.org> | 2020-09-03 14:16:08 +0000 |
commit | 999525211e1a5a22194411a4b078259137f5fe19 (patch) | |
tree | 3927532d2baa80554b30d4d446d5250868f988a2 /src/certtool.c | |
parent | 3c137c9f2888334596fb9f4313d4389d39afe8fd (diff) | |
parent | b0be5d7c39d4a5f7d29db4630926a4cef7c3edce (diff) | |
download | gnutls-999525211e1a5a22194411a4b078259137f5fe19.tar.gz |
Merge branch 'tmp-backport-3.6' into 'gnutls_3_6_x'
Backport bug fixes from master to gnutls_3_6_x
See merge request gnutls/gnutls!1317
Diffstat (limited to 'src/certtool.c')
-rw-r--r-- | src/certtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/certtool.c b/src/certtool.c index 0e24ac8281..6bdfe376b1 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -1426,9 +1426,9 @@ static void cmd_parser(int argc, char **argv) if (HAVE_OPT(VERIFY_PROFILE)) { if (strcasecmp(OPT_ARG(VERIFY_PROFILE), "none")) { - cinfo.verification_profile = GNUTLS_PROFILE_UNKNOWN; + cinfo.verification_profile = (gnutls_sec_param_t)GNUTLS_PROFILE_UNKNOWN; } else { - cinfo.verification_profile = gnutls_certificate_verification_profile_get_id(OPT_ARG(VERIFY_PROFILE)); + cinfo.verification_profile = (gnutls_sec_param_t)gnutls_certificate_verification_profile_get_id(OPT_ARG(VERIFY_PROFILE)); } } else if (!HAVE_OPT(VERIFY_ALLOW_BROKEN)) { if (HAVE_OPT(VERIFY_CHAIN) || HAVE_OPT(VERIFY)) { @@ -2956,7 +2956,7 @@ void generate_pkcs12(common_info_st * cinfo) } if (cinfo->hash != GNUTLS_DIG_UNKNOWN) - mac = cinfo->hash; + mac = (gnutls_mac_algorithm_t)cinfo->hash; else mac = GNUTLS_MAC_SHA1; |