aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-01-28 12:27:09 -0500
committerJack Lloyd <[email protected]>2018-01-28 12:27:09 -0500
commitaa2d16c81404ced37df474ab49fa980739e29294 (patch)
treeabaf95fab530e44d097e44911cc549e76dee2d84 /src
parentb2b55e6c2fdb824f49923b60d2c3ffff8f0fb99a (diff)
Reorder signature scheme list
Now PSS shows up first and we negotiate it by default ;)
Diffstat (limited to 'src')
-rw-r--r--src/lib/tls/tls_algos.cpp32
1 files changed, 20 insertions, 12 deletions
diff --git a/src/lib/tls/tls_algos.cpp b/src/lib/tls/tls_algos.cpp
index 415d3eb66..2a4d7ba26 100644
--- a/src/lib/tls/tls_algos.cpp
+++ b/src/lib/tls/tls_algos.cpp
@@ -194,24 +194,32 @@ std::string hash_function_of_scheme(Signature_Scheme scheme)
const std::vector<Signature_Scheme>& all_signature_schemes()
{
+ /*
+ * This is ordered in some approximate order of preference
+ */
static const std::vector<Signature_Scheme> all_schemes = {
- Signature_Scheme::RSA_PKCS1_SHA1,
- Signature_Scheme::RSA_PKCS1_SHA256,
+ //Signature_Scheme::EDDSA_448,
+ //Signature_Scheme::EDDSA_25519,
+
+ Signature_Scheme::RSA_PSS_SHA384,
+ Signature_Scheme::RSA_PSS_SHA256,
+ Signature_Scheme::RSA_PSS_SHA512,
+
Signature_Scheme::RSA_PKCS1_SHA384,
Signature_Scheme::RSA_PKCS1_SHA512,
- Signature_Scheme::DSA_SHA1,
- Signature_Scheme::DSA_SHA256,
+ Signature_Scheme::RSA_PKCS1_SHA256,
+
+ Signature_Scheme::ECDSA_SHA384,
+ Signature_Scheme::ECDSA_SHA512,
+ Signature_Scheme::ECDSA_SHA256,
+
Signature_Scheme::DSA_SHA384,
Signature_Scheme::DSA_SHA512,
+ Signature_Scheme::DSA_SHA256,
+
+ Signature_Scheme::RSA_PKCS1_SHA1,
Signature_Scheme::ECDSA_SHA1,
- Signature_Scheme::ECDSA_SHA256,
- Signature_Scheme::ECDSA_SHA384,
- Signature_Scheme::ECDSA_SHA512,
- Signature_Scheme::RSA_PSS_SHA256,
- Signature_Scheme::RSA_PSS_SHA384,
- Signature_Scheme::RSA_PSS_SHA512,
- Signature_Scheme::EDDSA_25519,
- Signature_Scheme::EDDSA_448,
+ Signature_Scheme::DSA_SHA1,
};
return all_schemes;