From 77676537f6aea6d9d44ec5bf52f64c582ad1c36c Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Thu, 22 Sep 2022 10:43:03 -0600 Subject: [PATCH 1/2] Fix undesirable kyber dependencies when not building kyber (#2) --- wolfcrypt/src/wc_kyber.c | 25 ++++++++++++++++++++++++- wolfcrypt/src/wc_kyber_poly.c | 25 ++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/wc_kyber.c b/wolfcrypt/src/wc_kyber.c index 62c3ed811..72e1f8f8d 100644 --- a/wolfcrypt/src/wc_kyber.c +++ b/wolfcrypt/src/wc_kyber.c @@ -1,3 +1,26 @@ +/* wc_kyber.c + * + * Copyright (C) 2006-2022 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ -#error "Contact wolfSSL to get the implementation of this file" +#include +#ifdef WOLFSSL_HAVE_KYBER + #error "Contact wolfSSL to get the implementation of this file" +#endif diff --git a/wolfcrypt/src/wc_kyber_poly.c b/wolfcrypt/src/wc_kyber_poly.c index 62c3ed811..d7025b0dc 100644 --- a/wolfcrypt/src/wc_kyber_poly.c +++ b/wolfcrypt/src/wc_kyber_poly.c @@ -1,3 +1,26 @@ +/* wc_kyber_poly.c + * + * Copyright (C) 2006-2022 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ -#error "Contact wolfSSL to get the implementation of this file" +#include +#ifdef WOLFSSL_HAVE_KYBER + #error "Contact wolfSSL to get the implementation of this file" +#endif From 938ab1690781bc81059b9a8ef94289a8eecdf478 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Thu, 22 Sep 2022 14:15:46 -0600 Subject: [PATCH 2/2] Also address assembly file --- wolfcrypt/src/wc_kyber_asm.S | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/wolfcrypt/src/wc_kyber_asm.S b/wolfcrypt/src/wc_kyber_asm.S index 62c3ed811..05cd12f7b 100644 --- a/wolfcrypt/src/wc_kyber_asm.S +++ b/wolfcrypt/src/wc_kyber_asm.S @@ -1,3 +1,27 @@ +/* wc_kyber_asm.S + * + * Copyright (C) 2006-2022 wolfSSL Inc. + * + * This file is part of wolfSSL. + * + * wolfSSL is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * wolfSSL is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA + */ -#error "Contact wolfSSL to get the implementation of this file" +#include + +#ifdef WOLFSSL_HAVE_KYBER + #error "Contact wolfSSL to get the implementation of this file" +#endif