summaryrefslogtreecommitdiff
path: root/lib/priority.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2018-02-19 14:57:55 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-02-19 15:29:29 +0100
commit962ef882031062866f6782078af17cf9701266da (patch)
tree5468c098639efaa6014b136a82a1cf6414911702 /lib/priority.c
parentc11835acafdb6e6ed75a81b4aaa11edb554df535 (diff)
downloadgnutls-962ef882031062866f6782078af17cf9701266da.tar.gz
Revert "priority: disable the enabled by default RSA-PSS signature algorithms"
This reverts commit ef44477127952c13e93d7ea88f7b549bf36602f5. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/priority.c')
-rw-r--r--lib/priority.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/priority.c b/lib/priority.c
index 6019321405..ff49875e7b 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2004-2015 Free Software Foundation, Inc.
- * Copyright (C) 2015-2018 Red Hat, Inc.
+ * Copyright (C) 2015-2017 Red Hat, Inc.
*
* Author: Nikos Mavrogiannopoulos
*
@@ -376,9 +376,9 @@ static const int _sign_priority_default[] = {
GNUTLS_SIGN_ECDSA_SHA1,
/* added on the final position for compatibility purposes */
- /*GNUTLS_SIGN_RSA_PSS_SHA256,
+ GNUTLS_SIGN_RSA_PSS_SHA256,
GNUTLS_SIGN_RSA_PSS_SHA384,
- GNUTLS_SIGN_RSA_PSS_SHA512,*/
+ GNUTLS_SIGN_RSA_PSS_SHA512,
GNUTLS_SIGN_EDDSA_ED25519,
0
@@ -407,9 +407,9 @@ static const int _sign_priority_secure128[] = {
GNUTLS_SIGN_ECDSA_SHA512,
/* added on the final position for compatibility purposes */
- /*GNUTLS_SIGN_RSA_PSS_SHA256,
+ GNUTLS_SIGN_RSA_PSS_SHA256,
GNUTLS_SIGN_RSA_PSS_SHA384,
- GNUTLS_SIGN_RSA_PSS_SHA512,*/
+ GNUTLS_SIGN_RSA_PSS_SHA512,
GNUTLS_SIGN_EDDSA_ED25519,
0
@@ -423,8 +423,8 @@ static const int _sign_priority_secure192[] = {
GNUTLS_SIGN_ECDSA_SHA512,
/* added on the final position for compatibility purposes */
- /*GNUTLS_SIGN_RSA_PSS_SHA384,
- GNUTLS_SIGN_RSA_PSS_SHA512,*/
+ GNUTLS_SIGN_RSA_PSS_SHA384,
+ GNUTLS_SIGN_RSA_PSS_SHA512,
0
};
static const int* sign_priority_secure192 = _sign_priority_secure192;