Join the 21st century: Cryptography is no longer an optional component

of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004

4 files changed, 9 insertions, 24 deletions

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 7166eb9..7365c57 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -786,7 +786,7 @@ installCustomCommit(dialogMenuItem *self)
  * installation but come back here again to load more distributions,
  * perhaps from a different media type.  This would allow, for
  * example, the user to load the majority of the system from CDROM and
- * then use ftp to load just the CRYPTO dist.
+ * then use ftp to load a different dist.
  */
 int
 installCommit(dialogMenuItem *self)
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 6830754..038355a 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -45,8 +45,6 @@ setSrc(dialogMenuItem *self)
 {
     Dists |= DIST_SRC;
     SrcDists = DIST_SRC_ALL;
-    CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
-	DIST_CRYPTO_SKERBEROS5);
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -55,8 +53,6 @@ clearSrc(dialogMenuItem *self)
 {
     Dists &= ~DIST_SRC;
     SrcDists = 0;
-    CRYPTODists &= ~(DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE |
-	DIST_CRYPTO_SKERBEROS5);
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -156,13 +152,13 @@ checkDistXUser(dialogMenuItem *self)
 static int
 checkDistMinimum(dialogMenuItem *self)
 {
-    return Dists == (DIST_BASE | DIST_CRYPTO);
+    return Dists == (DIST_BASE);
 }
 
 static int
 checkDistEverything(dialogMenuItem *self)
 {
-    return Dists == DIST_ALL && CRYPTODists == DIST_CRYPTO_ALL &&
+    return Dists == DIST_ALL &&
 	_IS_SET(SrcDists, DIST_SRC_ALL) &&
 	_IS_SET(XF86Dists, DIST_XF86_ALL) &&
 	_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) &&
@@ -976,8 +972,6 @@ DMenu MenuSubDistributions = {
       { " compat4x",	"FreeBSD 4.x binary compatibility",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT4X },
 #endif
-      { " crypto",	"Basic encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
       { " dict",	"Spelling checker dictionary files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
       { " doc",		"Miscellaneous FreeBSD online docs",
@@ -1022,6 +1016,8 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
       { " contrib",	"/usr/src/contrib (contributed software)",
 	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
+      { " crypto",	"/usr/src/crypto (contrib encryption sources)",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SCRYPTO },
       { " gnu",		"/usr/src/gnu (software from the GNU Project)",
 	dmenuFlagCheck,	dmenuSetFlag,	NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
       { " etc",		"/usr/src/etc (miscellaneous system files)",
@@ -1030,6 +1026,8 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
       { " include",	"/usr/src/include (header files)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
+      { " krb5",	"/usr/src/kerberos5 (sources for Kerberos5)",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SKERBEROS5 },
       { " lib",		"/usr/src/lib (system libraries)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
       { " libexec",	"/usr/src/libexec (system programs)",
@@ -1040,14 +1038,10 @@ DMenu MenuSrcDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
       { " sbin",	"/usr/src/sbin (system binaries)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
-      { " scrypto",	"/usr/src/crypto (contrib encryption sources)",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
+      { " secure",	"/usr/src/secure (BSD encryption sources)",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SSECURE },
       { " share",	"/usr/src/share (documents and shared files)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
-      { " skrb5",	"/usr/src/kerberos5 (sources for Kerberos5)",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
-      { " ssecure",	"/usr/src/secure (BSD encryption sources)",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE },
       { " sys",		"/usr/src/sys (FreeBSD kernel)",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
       { " tools",	"/usr/src/tools (miscellaneous tools)",
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 9a68698..078f0cc 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -429,8 +429,6 @@ Profiled libraries for developers.
 Dictionary information (for tools like spell).
 .It Li info
 GNU info files and other extra docs.
-.It Li crypto
-Encryption binaries and libraries.
 .It Li compat1x
 Compatibility with
 .Fx
@@ -635,11 +633,6 @@ Selects the full whack - all available distributions.
 .Pp
 .Sy Variables :
 None
-.It distSetCRYPTO
-Interactively select encryption subcomponents.
-.Pp
-.Sy Variables :
-None
 .It distSetSrc
 Interactively select source subcomponents.
 .Pp
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 8655ea7..8ae783e 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -108,7 +108,6 @@
 #define VAR_DISKINTERACTIVE		"diskInteractive"
 #define VAR_DISTS			"dists"
 #define VAR_DIST_MAIN			"distMain"
-#define VAR_DIST_CRYPTO			"distCRYPTO"
 #define VAR_DIST_SRC			"distSRC"
 #define VAR_DIST_X11			"distX11"
 #define VAR_DIST_XSERVER		"distXserver"
@@ -416,7 +415,6 @@ extern Boolean		OnVTY;			/* On a syscons VTY?				*/
 extern Variable		*VarHead;		/* The head of the variable chain		*/
 extern Device		*mediaDevice;		/* Where we're getting our distribution from	*/
 extern unsigned int	Dists;			/* Which distributions we want			*/
-extern unsigned int	CRYPTODists;		/* Which naughty distributions we want		*/
 extern unsigned int	SrcDists;		/* Which src distributions we want		*/
 extern unsigned int	XF86Dists;		/* Which XFree86 dists we want			*/
 extern unsigned int	XF86ServerDists;	/* The XFree86 servers we want			*/