mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-04-29 13:43:24 +02:00
Remove legacy NTRU and OQS (#4418)
* Remove NTRU and OQS * Keep the DTLS serialization format backwards compatible. * Remove n from mygetopt_long() call. * Fix over-zealous deletion. * Resolve problems found by @SparkiDev
This commit is contained in:
Anthony Hu
GitHub
@@ -24,7 +24,6 @@ EXTRA_DIST += \
|
||||
certs/ecc-client-keyPub.pem \
|
||||
certs/client-ecc-cert.pem \
|
||||
certs/client-ca.pem \
|
||||
certs/ntru-cert.pem \
|
||||
certs/dh2048.pem \
|
||||
certs/server-cert.pem \
|
||||
certs/server-ecc.pem \
|
||||
@@ -108,8 +107,6 @@ EXTRA_DIST += \
|
||||
|
||||
dist_doc_DATA+= certs/taoCert.txt
|
||||
|
||||
EXTRA_DIST+= certs/ntru-key.raw
|
||||
|
||||
include certs/1024/include.am
|
||||
include certs/3072/include.am
|
||||
include certs/4096/include.am
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFBzCCA++gAwIBAgIQMR8ILKCzOEvwC/AXGSWKWDANBgkqhkiG9w0BAQUFADCB
|
||||
lDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVt
|
||||
YW4xETAPBgNVBAoMCFNhd3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYD
|
||||
VQQDDA93d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNz
|
||||
bC5jb20wIhgPMjAyMTAyMDkxOTUwMzBaGA8yMDIzMTEwNzE5NTAzMFowgboxCzAJ
|
||||
BgNVBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMQ0w
|
||||
CwYDVQQEDARUZXN0MRAwDgYDVQQKDAd3b2xmU1NMMRQwEgYDVQQLDAtEZXZlbG9w
|
||||
bWVudDEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMRUwEwYDVQQFEwx3b2xmU1NM
|
||||
MTIzNDUxHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wggJNMBoGCysG
|
||||
AQQBwRYBAQEBBgsrBgEEAcEWAQECLgOCAi0ABIICKJXoRX/LkS71JEpP72eR3NN2
|
||||
FnLtLhBsM19zkQaNzr+HF88KgALHnkM1ufiPBu5BC3Qplb/Zk2UAK9oSbdSb9nr5
|
||||
cPCVie0MIUkYX3Dd6fICzVulmwUWeokFs9i82Li69tdtBVwlfzCihieZ+eafE27H
|
||||
wlnm1UIIWiTrYu3hs0GPepgJqc1Umj8gjm61k0KdeiYKjmFHFa+wuU+kUji6nljE
|
||||
yLA8iEbW7kefeQj01A4AMCAet74TuBm5r1Mly1/GT8cFyAj5Kn/mufgfaFNVrdvW
|
||||
q62pTFxJEFeLra/ShUulIx7f58SaaxMGk90bFSo1Q/HlNW1ijXulkO+XZkIsAyqU
|
||||
wfuh0HdIgQw+pHOn3UNrSWs4klsdm6lR/Vke4xoNedcyW7B6i1zd8QzeG57N4IZF
|
||||
1ZBdU2OBMcCBEvhL9TYdDRo5FZF7QUMv1d4C5R2nG176RBho65yFJoJT8VreyTDO
|
||||
MUlD5n0BQMdZzTIdFMaepB6LHKBKqI5uJh5PYaKdajM/WkJnBCIv9eHpBoNP9YBZ
|
||||
r/C9/5WcQAd37f5yk2AxxFdOve9jgXWI9X/E3QglVbwK84t2yIVRjq0ojEu1ln50
|
||||
dwWIpzbvmkPS2dD0/YhJQ22J1qfT8LosOKkB7t98m5E4MwgQVHUUWmR69VfPzggP
|
||||
AXRV3TXZkL0mSA/ml5P4rBuYmBFTogYIRZY80Gmmlx/Cz3nzvm/AHhH5+5zH279V
|
||||
Pzu/V7m2ADANBgkqhkiG9w0BAQUFAAOCAQEAawKWRypsPE0AvIWPiR6K7qgMWRe0
|
||||
vq+l9BqkkapQT5H5kIKAEsgFZTXYpZb4WLp5MOhZZVH16Q29p9KP84UuU3F3coHl
|
||||
UDQYEBwIfb8XJERcHftZluODYLKNm7nRyeEgQKAYyjTRt/2ShKBUqlt/2fTyvKi9
|
||||
IBR//pCoMY3o+jIg7Kiq6ro/GKZ7JHDayoahqlXJ08ZsbOU5A5GVYon9dGAGHoNE
|
||||
bkimZ3N4eDIHpxE/qCKp3GdYifQFxpUIemN3BdzToikg1CRRCcC65Qg7rRwJt91T
|
||||
wbzuhM1flJmm7nZMTyEVTpVrIud96clU5qdQ+qmbKwJzGxrS1eTs4QHcHg==
|
||||
-----END CERTIFICATE-----
|
||||
Binary file not shown.
+6
-110
@@ -35,9 +35,6 @@
|
||||
#
|
||||
# pkcs7:
|
||||
# test-degenerate.p7b
|
||||
# if HAVE_NTRU
|
||||
# ntru-cert.pem
|
||||
# ntru-key.raw
|
||||
###############################################################################
|
||||
######################## FUNCTIONS SECTION ####################################
|
||||
###############################################################################
|
||||
@@ -53,10 +50,6 @@ restore_config(){
|
||||
check_result(){
|
||||
if [ $1 -ne 0 ]; then
|
||||
echo "Failed at \"$2\", Abort"
|
||||
if [ "$2" = "configure for ntru" ] || \
|
||||
[ "$2" = "make check with ntru" ]; then
|
||||
restore_config
|
||||
fi
|
||||
exit 1
|
||||
else
|
||||
echo "Step Succeeded!"
|
||||
@@ -730,62 +723,19 @@ run_renewcerts(){
|
||||
echo "---------------------------------------------------------------------"
|
||||
}
|
||||
|
||||
#function for copy and pasting ntru updates
|
||||
move_ntru(){
|
||||
cp ntru-cert.pem certs/ntru-cert.pem || exit 1
|
||||
cp ntru-key.raw certs/ntru-key.raw || exit 1
|
||||
cp ntru-cert.der certs/ntru-cert.der || exit 1
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
##################### THE EXECUTABLE BODY #####################################
|
||||
###############################################################################
|
||||
|
||||
#start in root.
|
||||
cd ../ || exit 1
|
||||
#if HAVE_NTRU already defined && there is no argument
|
||||
if grep HAVE_NTRU "wolfssl/options.h" && [ -z "$1" ]
|
||||
then
|
||||
|
||||
#run the function to renew the certs
|
||||
run_renewcerts
|
||||
CURRDIR=${PWD##*/}
|
||||
if [ "$CURRDIR" = "certs" ]; then
|
||||
cd ../ || exit 1
|
||||
else
|
||||
echo "We are not in the right directory! Abort."
|
||||
exit 1
|
||||
fi
|
||||
echo "changed directory to wolfssl root directory."
|
||||
echo ""
|
||||
|
||||
############################################################
|
||||
########## update ntru if already installed ################
|
||||
############################################################
|
||||
|
||||
# We cannot assume that user has certgen and keygen enabled
|
||||
CFLAG_TMP="-DWOLFSSL_STATIC_RSA"
|
||||
export CFLAGS=${CFLAG_TMP}
|
||||
./configure --with-ntru --enable-certgen --enable-keygen
|
||||
check_result $? "configure for ntru"
|
||||
make check
|
||||
check_result $? "make check with ntru"
|
||||
export CFLAGS=""
|
||||
|
||||
#copy/paste ntru-certs and key to certs/
|
||||
move_ntru
|
||||
|
||||
#else if there was an argument given, check it for validity or print out error
|
||||
elif [ ! -z "$1" ]; then
|
||||
#valid argument then renew certs without ntru
|
||||
if [ "$1" == "--override-ntru" ]; then
|
||||
echo "overriding ntru, update all certs except ntru."
|
||||
run_renewcerts
|
||||
#if there was an argument given, check it for validity or print out error
|
||||
if [ ! -z "$1" ]; then
|
||||
#valid argument print out other valid arguments
|
||||
elif [ "$1" == "-h" ] || [ "$1" == "-help" ]; then
|
||||
if [ "$1" == "-h" ] || [ "$1" == "-help" ]; then
|
||||
echo ""
|
||||
echo "\"no argument\" will attempt to update all certificates"
|
||||
echo "--override-ntru updates all certificates except ntru"
|
||||
echo "-h or -help display this menu"
|
||||
echo ""
|
||||
echo ""
|
||||
@@ -797,7 +747,6 @@ elif [ ! -z "$1" ]; then
|
||||
echo "use -h or -help for a list of available options."
|
||||
echo ""
|
||||
fi
|
||||
#else HAVE_NTRU not already defined
|
||||
else
|
||||
echo "Saving the configure state"
|
||||
echo ""
|
||||
@@ -809,63 +758,10 @@ else
|
||||
make clean
|
||||
check_result $? "make clean"
|
||||
|
||||
#attempt to define ntru by configuring with ntru
|
||||
echo "Configuring with ntru, enabling certgen and keygen"
|
||||
echo ""
|
||||
CFLAG_TMP="-DWOLFSSL_STATIC_RSA"
|
||||
export CFLAGS=${CFLAG_TMP}
|
||||
./configure --with-ntru --enable-certgen --enable-keygen
|
||||
check_result $? "configure for ntru"
|
||||
make check
|
||||
check_result $? "make check with ntru"
|
||||
export CFLAGS=""
|
||||
# restore previous configure state
|
||||
restore_config
|
||||
check_result $? "restoring old configuration"
|
||||
|
||||
# check options.h a second time, if the user had
|
||||
# ntru installed on their system and in the default
|
||||
# path location, then it will now be defined, if the
|
||||
# user does not have ntru on their system this will fail
|
||||
# again and we will not update any certs until user installs
|
||||
# ntru in the default location
|
||||
|
||||
# if now defined
|
||||
if grep HAVE_NTRU "wolfssl/options.h"; then
|
||||
run_renewcerts
|
||||
CURRDIR=${PWD##*/}
|
||||
if [ "$CURRDIR" = "certs" ]; then
|
||||
cd ../ || exit 1
|
||||
else
|
||||
echo "We are not in the right directory! Abort."
|
||||
exit 1
|
||||
fi
|
||||
echo "changed directory to wolfssl root directory."
|
||||
echo ""
|
||||
|
||||
move_ntru
|
||||
|
||||
echo "ntru-certs, and ntru-key.raw have been updated"
|
||||
echo ""
|
||||
|
||||
# restore previous configure state
|
||||
restore_config
|
||||
check_result $? "restoring old configuration"
|
||||
else
|
||||
|
||||
# restore previous configure state
|
||||
restore_config
|
||||
check_result $? "restoring old configuration"
|
||||
|
||||
echo ""
|
||||
echo "ntru is not installed at the default location,"
|
||||
echo "or ntru not installed, none of the certs were updated."
|
||||
echo ""
|
||||
echo "clone the ntru repository into your \"cd ~\" directory then,"
|
||||
echo "\"cd NTRUEncrypt\" and run \"make\" then \"make install\""
|
||||
echo "once complete run this script again to update all the certs."
|
||||
echo ""
|
||||
echo "To update all certs except ntru use \"./renewcerts.sh --override-ntru\""
|
||||
echo ""
|
||||
|
||||
fi #END now defined
|
||||
fi #END already defined
|
||||
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user