diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-06-15 09:26:49 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-06-15 09:26:49 +0000 |
| commit | 5c7ec5abb8947795b35b18a91eaaf097ebff4d06 (patch) | |
| tree | 5b7baaa0a10991aa52cb2f2fb24ed0b618a46f8a /src | |
| parent | 19684cc408a44cf2993a3d59a9cb651072166b8e (diff) | |
| parent | a6682109440d8ba1163c4e207e41833c7962dcd6 (diff) | |
| download | gnutls-5c7ec5abb8947795b35b18a91eaaf097ebff4d06.tar.gz | |
Merge branch 'tmp-enum' into 'master'
build: minor fixes
See merge request gnutls/gnutls!1287
Diffstat (limited to 'src')
| -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; |