Delete the RSAREF=YES example from make.conf - it is not used at all.

Add knobs for the optional crypto parts with some notes.

2 files changed, 32 insertions, 8 deletions

diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index f88564b..17d7b1d 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -76,10 +76,22 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=true	# do not build modules when building kernel
 #
-# To tell the base system that you are using RSAREF (from ports).
-# (This needs revisiting) - it is very likely that this is too
-# heavily tied to USA_RESIDENT==YES.
-#RSAREF=	YES
+#
+# Controls for building various OPTIONAL parts of the crypto system.
+# Patents are involved - you must not use these unless you either have
+# a license or would be within patent 'fair use' provisions.
+# Generally 'educational use' is OK, but personal (even non-commercial)
+# use is not.
+# *** It is YOUR RESPONSIBILITY to determine if you can use these! ***
+#
+# Patented in the USA and many european countries - thought to be OK to
+# use for any non-commercial use.  This is optional.
+#WITH_IDEA=	YES	# IDEA (128 bit symmetric encryption)
+#
+# Patented in the USA only (due to expire in September 2000).  RSA is
+# required for OpenSSH.  Either use this or ports/security/rsaref.
+#WITH_RSAINTL=	YES	# RSA (public key exchange)
+#
 #
 # To avoid running MAKEDEV all on /dev during install:
 #NO_MAKEDEV=	true
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index f88564b..17d7b1d 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -76,10 +76,22 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=true	# do not build modules when building kernel
 #
-# To tell the base system that you are using RSAREF (from ports).
-# (This needs revisiting) - it is very likely that this is too
-# heavily tied to USA_RESIDENT==YES.
-#RSAREF=	YES
+#
+# Controls for building various OPTIONAL parts of the crypto system.
+# Patents are involved - you must not use these unless you either have
+# a license or would be within patent 'fair use' provisions.
+# Generally 'educational use' is OK, but personal (even non-commercial)
+# use is not.
+# *** It is YOUR RESPONSIBILITY to determine if you can use these! ***
+#
+# Patented in the USA and many european countries - thought to be OK to
+# use for any non-commercial use.  This is optional.
+#WITH_IDEA=	YES	# IDEA (128 bit symmetric encryption)
+#
+# Patented in the USA only (due to expire in September 2000).  RSA is
+# required for OpenSSH.  Either use this or ports/security/rsaref.
+#WITH_RSAINTL=	YES	# RSA (public key exchange)
+#
 #
 # To avoid running MAKEDEV all on /dev during install:
 #NO_MAKEDEV=	true