more updates for the security param rename

diff --git a/NEWS b/NEWS
index 784022cd49c4bbf3966da3fb24a7911fafeb7151..9af4fb4c1cce4789f170e4b89bea1232a2a7f8d5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,8 @@ See the end for copying conditions.
 
 * Version 3.3.0 (unreleased)
 
-** libgnutls: Security parameter NORMAL was renamed to MEDIUM
-to avoid confusion with the priority string NORMAL.
+** libgnutls: Security parameter SEC_PARAM_NORMAL was renamed to 
+SEC_PARAM_MEDIUM to avoid confusion with the priority string NORMAL.
 
 ** libgnutls: certificate verification profiles were introduced
 that can be specified as flags to verification functions. They

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 48455065b39851d17799d237ffbc6dd9db55475a..b5c920f9ac0f07cb783f97ea0e904affc4175538 100644 (file)
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -632,7 +632,7 @@ get_bits(gnutls_pk_algorithm_t key_type, int info_bits,
                } else
                        bits =
                            gnutls_sec_param_to_pk_bits(key_type,
-                                                       GNUTLS_SEC_PARAM_NORMAL);
+                                                       GNUTLS_SEC_PARAM_MEDIUM);
        }
 
        return bits;
@@ -644,8 +644,8 @@ gnutls_sec_param_t str_to_sec_param(const char *str)
                return GNUTLS_SEC_PARAM_LOW;
        } else if (strcasecmp(str, "legacy") == 0) {
                return GNUTLS_SEC_PARAM_LEGACY;
-       } else if (strcasecmp(str, "normal") == 0) {
-               return GNUTLS_SEC_PARAM_NORMAL;
+       } else if (strcasecmp(str, "normal") == 0 || strcasecmp(str, "medium")) {
+               return GNUTLS_SEC_PARAM_MEDIUM;
        } else if (strcasecmp(str, "high") == 0) {
                return GNUTLS_SEC_PARAM_HIGH;
        } else if (strcasecmp(str, "ultra") == 0) {

diff --git a/src/serv.c b/src/serv.c
index c63868670c1ca30a4503fc5bc595fd615be9534f..60d4e970f11d9a22189948fd1334b268432cc2f8 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -170,7 +170,7 @@ static int generate_dh_primes(void)
 {
        int prime_bits =
            gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH,
-                                       GNUTLS_SEC_PARAM_NORMAL);
+                                       GNUTLS_SEC_PARAM_MEDIUM);
 
        if (gnutls_dh_params_init(&dh_params) < 0) {
                fprintf(stderr, "Error in dh parameter initialization\n");