Merge pull request #148 from open-quantum-safe/OQS-v9

Release 2023-10 snapshot and update IDs to reflect updated McEliece in liboqs v0.9.0

README.md

@@ -74,7 +74,7 @@ The following hybrid algorithms are made available:
 
 <!--- OQS_TEMPLATE_FRAGMENT_LIST_ALL_HYBRID_KEXS_START -->
 - **BIKE**: `[email protected]` `[email protected]`
-- **ClassicMcEliece**: `ecdh-nistp256-classic-mceliece-348864r3[email protected]` `ecdh-nistp256-classic-mceliece-348864fr3[email protected]` `ecdh-nistp384-classic-mceliece-460896r3[email protected]` `ecdh-nistp384-classic-mceliece-460896fr3[email protected]` `ecdh-nistp521-classic-mceliece-6688128r3[email protected]` `ecdh-nistp521-classic-mceliece-6688128fr3[email protected]` `ecdh-nistp521-classic-mceliece-6960119r3[email protected]` `ecdh-nistp521-classic-mceliece-6960119fr3[email protected]` `ecdh-nistp521-classic-mceliece-8192128r3[email protected]` `ecdh-nistp521-classic-mceliece-8192128fr3[email protected]`
+- **ClassicMcEliece**: `ecdh-nistp256-classic-mceliece-348864r4[email protected]` `ecdh-nistp256-classic-mceliece-348864fr4[email protected]` `ecdh-nistp384-classic-mceliece-460896r4[email protected]` `ecdh-nistp384-classic-mceliece-460896fr4[email protected]` `ecdh-nistp521-classic-mceliece-6688128r4[email protected]` `ecdh-nistp521-classic-mceliece-6688128fr4[email protected]` `ecdh-nistp521-classic-mceliece-6960119r4[email protected]` `ecdh-nistp521-classic-mceliece-6960119fr4[email protected]` `ecdh-nistp521-classic-mceliece-8192128r4[email protected]` `ecdh-nistp521-classic-mceliece-8192128fr4[email protected]`
 - **FrodoKEM**: `[email protected]` `[email protected]` `[email protected]` `[email protected]` `[email protected]` `[email protected]`
 - **HQC**: `[email protected]` `[email protected]` `[email protected]`
 - **Kyber**: `[email protected]` `[email protected]` `[email protected]`

RELEASE.md

@@ -1,4 +1,4 @@
-OQS-OpenSSH snapshot 2022-08
+OQS-OpenSSH snapshot 2023-10
 ============================
 
 About
@@ -13,25 +13,20 @@ The **Open Quantum Safe (OQS) project** has the goal of developing and prototypi
 Release notes
 =============
 
-This is the 2022-08 snapshot release of OQS-OpenSSH, released on August 23, 2022. This release is intended to be used with liboqs version 0.7.2.
+This is the 2023-10 snapshot release of OQS-OpenSSH, released on October 21, 2023. This release is intended to be used with liboqs version 0.9.0.
 
 What's New
 ----------
 
 This is the seventh snapshot release of the OQS fork of OpenSSH.  It is based on OpenSSH 8.9 portable 1.
 
-- Update to upstream v8.9p1.
-- Remove Rainbow level 1 and SIKE/SIDH.
+- Update algorithm list in line with `liboqs` v0.9.0.
 
 ---
 
 Detailed changelog
 ------------------
 
-* Use mpint representation for shared_secret when deriving keys in pure-PQ key exchange, and some other bug fixes; fixes #119 by @kevinmkane in https://github.com/open-quantum-safe/openssh/pull/120
-* V_8_9_P1 upgrade by @christianpaquin in https://github.com/open-quantum-safe/openssh/pull/121
-* bring testing and documentation in line by @baentsch in https://github.com/open-quantum-safe/openssh/pull/123
-* remove rainbowI, sike/sidh by @baentsch in https://github.com/open-quantum-safe/openssh/pull/126
+* Update IDs to reflect updated McEliece in liboqs v0.9.0 in https://github.com/open-quantum-safe/openssh/pull/148
 
-
-**Full Changelog**: https://github.com/open-quantum-safe/openssh/compare/OQS-OpenSSH-snapshot-2022-01...OQS-OpenSSH-snapshot-2022-08
+**Full Changelog**: https://github.com/open-quantum-safe/openssh/compare/OQS-OpenSSH-snapshot-2023-06...OQS-OpenSSH-snapshot-2023-10

kex.h

@@ -101,16 +101,16 @@
 #define	KEX_KYBER_1024_ECDH_NISTP521_SHA512	"[email protected]"
 #define	KEX_BIKE_L1_ECDH_NISTP256_SHA512	"[email protected]"
 #define	KEX_BIKE_L3_ECDH_NISTP384_SHA512	"[email protected]"
-#define	KEX_CLASSIC_MCELIECE_348864_ECDH_NISTP256_SHA256	"ecdh-nistp256-classic-mceliece-348864r3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_348864F_ECDH_NISTP256_SHA256	"ecdh-nistp256-classic-mceliece-348864fr3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_460896_ECDH_NISTP384_SHA512	"ecdh-nistp384-classic-mceliece-460896r3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_460896F_ECDH_NISTP384_SHA512	"ecdh-nistp384-classic-mceliece-460896fr3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_6688128_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6688128r3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_6688128F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6688128fr3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_6960119_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6960119r3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_6960119F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6960119fr3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_8192128_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-8192128r3[email protected]"
-#define	KEX_CLASSIC_MCELIECE_8192128F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-8192128fr3[email protected]"
+#define	KEX_CLASSIC_MCELIECE_348864_ECDH_NISTP256_SHA256	"ecdh-nistp256-classic-mceliece-348864r4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_348864F_ECDH_NISTP256_SHA256	"ecdh-nistp256-classic-mceliece-348864fr4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_460896_ECDH_NISTP384_SHA512	"ecdh-nistp384-classic-mceliece-460896r4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_460896F_ECDH_NISTP384_SHA512	"ecdh-nistp384-classic-mceliece-460896fr4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_6688128_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6688128r4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_6688128F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6688128fr4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_6960119_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6960119r4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_6960119F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-6960119fr4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_8192128_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-8192128r4[email protected]"
+#define	KEX_CLASSIC_MCELIECE_8192128F_ECDH_NISTP521_SHA512	"ecdh-nistp521-classic-mceliece-8192128fr4[email protected]"
 #define	KEX_HQC_128_ECDH_NISTP256_SHA256	"[email protected]"
 #define	KEX_HQC_192_ECDH_NISTP384_SHA384	"[email protected]"
 #define	KEX_HQC_256_ECDH_NISTP521_SHA512	"[email protected]"

myproposal.h

@@ -62,25 +62,25 @@
 	"bike-l3-sha512," \
 	"[email protected]," \
 	"classic-mceliece-348864-sha256," \
-	"ecdh-nistp256-classic-mceliece-348864r3[email protected]," \
+	"ecdh-nistp256-classic-mceliece-348864r4[email protected]," \
 	"classic-mceliece-348864f-sha256," \
-	"ecdh-nistp256-classic-mceliece-348864fr3[email protected]," \
+	"ecdh-nistp256-classic-mceliece-348864fr4[email protected]," \
 	"classic-mceliece-460896-sha512," \
-	"ecdh-nistp384-classic-mceliece-460896r3[email protected]," \
+	"ecdh-nistp384-classic-mceliece-460896r4[email protected]," \
 	"classic-mceliece-460896f-sha512," \
-	"ecdh-nistp384-classic-mceliece-460896fr3[email protected]," \
+	"ecdh-nistp384-classic-mceliece-460896fr4[email protected]," \
 	"classic-mceliece-6688128-sha512," \
-	"ecdh-nistp521-classic-mceliece-6688128r3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-6688128r4[email protected]," \
 	"classic-mceliece-6688128f-sha512," \
-	"ecdh-nistp521-classic-mceliece-6688128fr3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-6688128fr4[email protected]," \
 	"classic-mceliece-6960119-sha512," \
-	"ecdh-nistp521-classic-mceliece-6960119r3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-6960119r4[email protected]," \
 	"classic-mceliece-6960119f-sha512," \
-	"ecdh-nistp521-classic-mceliece-6960119fr3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-6960119fr4[email protected]," \
 	"classic-mceliece-8192128-sha512," \
-	"ecdh-nistp521-classic-mceliece-8192128r3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-8192128r4[email protected]," \
 	"classic-mceliece-8192128f-sha512," \
-	"ecdh-nistp521-classic-mceliece-8192128fr3[email protected]," \
+	"ecdh-nistp521-classic-mceliece-8192128fr4[email protected]," \
 	"hqc-128-sha256," \
 	"[email protected]," \
 	"hqc-192-sha384," \

oqs-template/generate.yml

@@ -119,7 +119,7 @@ kexs:
       -
         name: 'nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
-        pretty_name: 'ecdh-nistp256-classic-mceliece-348864r3[email protected]'
+        pretty_name: 'ecdh-nistp256-classic-mceliece-348864r4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_348864f'
@@ -129,7 +129,7 @@ kexs:
       -
         name: 'nistp256'
         openssl_nid: 'NID_X9_62_prime256v1'
-        pretty_name: 'ecdh-nistp256-classic-mceliece-348864fr3[email protected]'
+        pretty_name: 'ecdh-nistp256-classic-mceliece-348864fr4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_460896'
@@ -139,7 +139,7 @@ kexs:
       -
         name: 'nistp384'
         openssl_nid: 'NID_secp384r1'
-        pretty_name: 'ecdh-nistp384-classic-mceliece-460896r3[email protected]'
+        pretty_name: 'ecdh-nistp384-classic-mceliece-460896r4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_460896f'
@@ -149,7 +149,7 @@ kexs:
       -
         name: 'nistp384'
         openssl_nid: 'NID_secp384r1'
-        pretty_name: 'ecdh-nistp384-classic-mceliece-460896fr3[email protected]'
+        pretty_name: 'ecdh-nistp384-classic-mceliece-460896fr4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_6688128'
@@ -159,7 +159,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-6688128r3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-6688128r4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_6688128f'
@@ -169,7 +169,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-6688128fr3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-6688128fr4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_6960119'
@@ -179,7 +179,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-6960119r3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-6960119r4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_6960119f'
@@ -189,7 +189,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-6960119fr3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-6960119fr4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_8192128'
@@ -199,7 +199,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-8192128r3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-8192128r4[email protected]'
   -
     family: 'ClassicMcEliece'
     name: 'classic_mceliece_8192128f'
@@ -209,7 +209,7 @@ kexs:
       -
         name: 'nistp521'
         openssl_nid: 'NID_secp521r1'
-        pretty_name: 'ecdh-nistp521-classic-mceliece-8192128fr3[email protected]'
+        pretty_name: 'ecdh-nistp521-classic-mceliece-8192128fr4[email protected]'
   -
     family: 'HQC'
     name: 'hqc_128'

oqs-test/try_connection.py

@@ -35,25 +35,25 @@
     "bike-l3-sha512",
     "[email protected]",
     "classic-mceliece-348864-sha256",
-    "ecdh-nistp256-classic-mceliece-348864r3[email protected]",
+    "ecdh-nistp256-classic-mceliece-348864r4[email protected]",
     "classic-mceliece-348864f-sha256",
-    "ecdh-nistp256-classic-mceliece-348864fr3[email protected]",
+    "ecdh-nistp256-classic-mceliece-348864fr4[email protected]",
     "classic-mceliece-460896-sha512",
-    "ecdh-nistp384-classic-mceliece-460896r3[email protected]",
+    "ecdh-nistp384-classic-mceliece-460896r4[email protected]",
     "classic-mceliece-460896f-sha512",
-    "ecdh-nistp384-classic-mceliece-460896fr3[email protected]",
+    "ecdh-nistp384-classic-mceliece-460896fr4[email protected]",
     "classic-mceliece-6688128-sha512",
-    "ecdh-nistp521-classic-mceliece-6688128r3[email protected]",
+    "ecdh-nistp521-classic-mceliece-6688128r4[email protected]",
     "classic-mceliece-6688128f-sha512",
-    "ecdh-nistp521-classic-mceliece-6688128fr3[email protected]",
+    "ecdh-nistp521-classic-mceliece-6688128fr4[email protected]",
     "classic-mceliece-6960119-sha512",
-    "ecdh-nistp521-classic-mceliece-6960119r3[email protected]",
+    "ecdh-nistp521-classic-mceliece-6960119r4[email protected]",
     "classic-mceliece-6960119f-sha512",
-    "ecdh-nistp521-classic-mceliece-6960119fr3[email protected]",
+    "ecdh-nistp521-classic-mceliece-6960119fr4[email protected]",
     "classic-mceliece-8192128-sha512",
-    "ecdh-nistp521-classic-mceliece-8192128r3[email protected]",
+    "ecdh-nistp521-classic-mceliece-8192128r4[email protected]",
     "classic-mceliece-8192128f-sha512",
-    "ecdh-nistp521-classic-mceliece-8192128fr3[email protected]",
+    "ecdh-nistp521-classic-mceliece-8192128fr4[email protected]",
     "hqc-128-sha256",
     "[email protected]",
     "hqc-192-sha384",