final code sweep

Author: andrewyounkers

kex-names.c

@@ -76,14 +76,6 @@ static const struct kexalg kexalgs[] = {
 #if defined(HAVE_EVP_SHA256) || !defined(WITH_OPENSSL)
 	{ KEX_CURVE25519_SHA256, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 },
 	{ KEX_CURVE25519_SHA256_OLD, KEX_C25519_SHA256, 0, SSH_DIGEST_SHA256 },
-#ifdef USE_SNTRUP761X25519
-	{ KEX_NTRUPRIME_SNTRUP761_SHA512, KEX_KEM_NTRUPRIME_SNTRUP761_X25519_SHA512, 0,
-	    SSH_DIGEST_SHA512 },
-#endif
-#ifdef USE_MLKEM768X25519
-	{ KEX_ML_KEM_768_SHA256, KEX_KEM_ML_KEM_768_X25519_SHA256, 0,
-	    SSH_DIGEST_SHA256 },
-#endif
 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
 
 ///// OQS_TEMPLATE_FRAGMENT_ADD_KEX_ALGS_START

oqs-template/sshd-session.c/point_to_kex_gen.fragment

@@ -109,9 +109,6 @@
 #include "srclimit.h"
 #include "dh.h"
 
-#include "oqs/oqs.h"
-#include "oqs-utils.h"
-
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD	(STDERR_FILENO + 1)
 #define REEXEC_CONFIG_PASS_FD		(STDERR_FILENO + 2)