From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 18 Nov 2020 17:19:43 +0000 (+0100)
Subject: oqs: Complete post-quantum signature support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79f127ca31b546af94e976bdb252baedeaec15e8;p=thirdparty%2Fstrongswan.git

oqs: Complete post-quantum signature support
---

diff --git a/src/libstrongswan/tests/suites/test_hasher.c b/src/libstrongswan/tests/suites/test_hasher.c
index 81213c0e47..f32888ff77 100644
--- a/src/libstrongswan/tests/suites/test_hasher.c
+++ b/src/libstrongswan/tests/suites/test_hasher.c
@@ -62,6 +62,9 @@ static hasher_oid_t oids[] = {
 	{ OID_ECDSA_WITH_SHA384, HASH_SHA384, KEY_ECDSA },             /* 30 */
 	{ OID_ECDSA_WITH_SHA512, HASH_SHA512, KEY_ECDSA },             /* 31 */
 	{ OID_UNKNOWN, HASH_UNKNOWN, KEY_ECDSA },                      /* 32 */
+	{ OID_DILITHIUM_2, HASH_IDENTITY, KEY_DILITHIUM_2},            /* 33 */
+	{ OID_DILITHIUM_3, HASH_IDENTITY, KEY_DILITHIUM_3},            /* 34 */
+	{ OID_DILITHIUM_4, HASH_IDENTITY, KEY_DILITHIUM_4},            /* 35 */
 };
 
 START_TEST(test_hasher_from_oid)
@@ -110,7 +113,10 @@ static struct {
 	{ SIGN_ECDSA_521,             HASH_SHA512     },
 	{ SIGN_ED25519,               HASH_IDENTITY   },
 	{ SIGN_ED448,                 HASH_IDENTITY   },
-	{ 30,						  HASH_UNKNOWN    },
+	{ SIGN_DILITHIUM_2,           HASH_IDENTITY   },
+	{ SIGN_DILITHIUM_3,           HASH_IDENTITY   },
+	{ SIGN_DILITHIUM_4,           HASH_IDENTITY   },
+	{ 30,                         HASH_UNKNOWN    },
 };
 
 START_TEST(test_hasher_from_sig_scheme)
diff --git a/src/pki/man/pki---gen.1.in b/src/pki/man/pki---gen.1.in
index 703f88086e..b372c1876b 100644
--- a/src/pki/man/pki---gen.1.in
+++ b/src/pki/man/pki---gen.1.in
@@ -45,8 +45,9 @@ Set debug level, default: 1.
 Read command line options from \fIfile\fR.
 .TP
 .BI "\-t, \-\-type " type
-Type of key to generate. Either \fIrsa\fR, \fIecdsa\fR, \fIed25519\fR or
-\fIed448\fR, defaults to \fIrsa\fR.
+Type of key to generate. Either \fIrsa\fR, \fIecdsa\fR, \fIed25519\fR,
+\fIed448\fR, \fIdilithium2\fR, \fIdilithium3\fR or \fIdilitium4\fR,
+defaults to \fIrsa\fR.
 .TP
 .BI "\-s, \-\-size " bits
 Key length in bits. Defaults to 2048 for \fIrsa\fR and 384 for \fIecdsa\fR.