Merge pull request #595 from h2o/kazuho/mlkem

[cli] add support for mlkem
h2o · Nov 21, 2024 · 6d241bd · 6d241bd
2 parents 384b18a + 6711687
commit 6d241bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/deps/picotls b/deps/picotls
diff --git a/src/cli.c b/src/cli.c
@@ -1707,27 +1707,17 @@ int main(int argc, char **argv)
             raw_pubkey_file = optarg;
             break;
         case 'x': {
-            size_t i;
-            for (i = 0; key_exchanges[i] != NULL; ++i)
-                ;
-#define MATCH(name)                                                                                                                \
-    if (key_exchanges[i] == NULL && strcasecmp(optarg, #name) == 0)                                                                \
-    key_exchanges[i] = &ptls_openssl_##name
-            MATCH(secp256r1);
-#if PTLS_OPENSSL_HAVE_SECP384R1
-            MATCH(secp384r1);
-#endif
-#if PTLS_OPENSSL_HAVE_SECP521R1
-            MATCH(secp521r1);
-#endif
-#if PTLS_OPENSSL_HAVE_X25519
-            MATCH(x25519);
-#endif
-#undef MATCH
-            if (key_exchanges[i] == NULL) {
+            ptls_key_exchange_algorithm_t **named, **slot;
+            for (named = ptls_openssl_key_exchanges_all; *named != NULL; ++named)
+                if (strcasecmp((*named)->name, optarg) == 0)
+                    break;
+            if (*named == NULL) {
                 fprintf(stderr, "unknown key exchange: %s\n", optarg);
                 exit(1);
             }
+            for (slot = key_exchanges; *slot != NULL; ++slot)
+                ;
+            *slot = *named;
         } break;
         case 'X':
             if (sscanf(optarg, "%" SCNu64, &ctx.transport_params.max_streams_bidi) != 1) {
+27 −0		include/picotls.h
+7 −0		include/picotls/openssl.h
+152 −0		lib/openssl.c
+46 −5		lib/picotls.c
+24 −24		picotls.xcodeproj/project.pbxproj
+1 −1		picotlsvs/bcrypt-test/bcrypt-test.vcxproj
+1 −1		picotlsvs/fusiontest/fusiontest.vcxproj
+1 −1		picotlsvs/picotls-bcrypt/picotls-bcrypt.vcxproj
+1 −1		picotlsvs/picotls-core/picotls-core.vcxproj
+1 −1		picotlsvs/picotls-fusion/picotls-fusion.vcxproj
+1 −1		picotlsvs/picotls-minicrypto-deps/picotls-minicrypto-deps.vcxproj
+1 −1		picotlsvs/picotls-minicrypto/picotls-minicrypto.vcxproj
+1 −1		picotlsvs/picotls-openssl/picotls-openssl.vcxproj
+1 −1		picotlsvs/picotlsvs/picotlsvs.vcxproj
+1 −1		picotlsvs/ptlsbench/ptlsbench.vcxproj
+1 −1		picotlsvs/testopenssl/testopenssl.vcxproj
+23 −19		t/cli.c
+4 −0		t/openssl.c
+57 −37		t/picotls.c