Revise this for the brave new world of "crypto"

Submitted by:	markm
Approved by:	me!

12 files changed, 157 insertions, 152 deletions

diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c
index 7d8dc9c..0b388b4 100644
--- a/usr.sbin/sade/dispatch.c
+++ b/usr.sbin/sade/dispatch.c
@@ -73,7 +73,7 @@ static struct _word {
     { "distSetXUser",		distSetXUser		},
     { "distSetMinimum",		distSetMinimum		},
     { "distSetEverything",	distSetEverything	},
-    { "distSetDES",		distSetDES		},
+    { "distSetCRYPTO",		distSetCRYPTO		},
     { "distSetSrc",		distSetSrc		},
     { "distSetXF86",		distSetXF86		},
     { "distExtractAll",		distExtractAll		},
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 60152b0..83972b0 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -201,10 +201,10 @@ installInitial(void)
     if (!variable_get(VAR_NO_WARN))
 	if (msgYesNo(
 	    "Last Chance!  Are you SURE you want continue the installation?\n\n"
-	     "If you're running this on a disk with data you wish to save\n"
-	     "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n"
-	     "proceeding!\n\n"
-	     "We can take no responsibility for lost disk contents!") != 0)
+	    "If you're running this on a disk with data you wish to save\n"
+	    "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n"
+	    "proceeding!\n\n"
+	    "We can take no responsibility for lost disk contents!") != 0)
 	return DITEM_FAILURE;
 
     if (DITEM_STATUS(diskLabelCommit(NULL)) != DITEM_SUCCESS) {
@@ -538,11 +538,11 @@ nodisks:
     }
 
     if (msgYesNo("Will this machine be a leaf node (e.g. will not forward packets)\n"
-		  "between interfaces)?"))
+		 "between interfaces)?"))
 	variable_set2("gateway_enable", "YES", 1);
 
     if (msgYesNo("Do you want to grant only normal users FTP access to this\n"
-	           "host (e.g. no anonymous FTP connections)?"))
+	         "host (e.g. no anonymous FTP connections)?"))
 	configAnonFTP(self);
 
     if (!msgYesNo("Do you want to configure this machine as an NFS server?"))
@@ -630,7 +630,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 DES dist.
+ * then use ftp to load just the CRYPTO dist.
  */
 int
 installCommit(dialogMenuItem *self)
@@ -757,7 +757,7 @@ installFixupBin(dialogMenuItem *self)
 	for (i = 0; devs[i]; i++) {
 	    Disk *disk = (Disk *)devs[i]->private;
 	    Chunk *c1;
-	    
+
 	    if (!devs[i]->enabled)
 		continue;
 	    if (!disk->chunks)
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index d1e5bbc..c294bc3 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -61,18 +61,18 @@ clearSrc(dialogMenuItem *self)
 }
 
 static int
-setDES(dialogMenuItem *self)
+setCRYPTO(dialogMenuItem *self)
 {
-    Dists |= DIST_DES;
-    DESDists = DIST_DES_ALL;
+    Dists |= DIST_CRYPTO;
+    CRYPTODists = DIST_CRYPTO_ALL;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
 static int
-clearDES(dialogMenuItem *self)
+clearCRYPTO(dialogMenuItem *self)
 {
-    Dists &= ~DIST_DES;
-    DESDists = 0;
+    Dists &= ~DIST_CRYPTO;
+    CRYPTODists = 0;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -128,10 +128,10 @@ clearX11Fonts(dialogMenuItem *self)
 #define _IS_SET(dist, set) (((dist) & (set)) == (set))
 
 #define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
-	_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
+	_IS_SET(dist, _DIST_DEVELOPER | DIST_CRYPTO | extra))
 
 #define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
-	_IS_SET(dist, _DIST_USER | DIST_DES | extra))
+	_IS_SET(dist, _DIST_USER | DIST_CRYPTO | extra))
 
 static int
 checkDistDeveloper(dialogMenuItem *self)
@@ -185,9 +185,9 @@ checkDistEverything(dialogMenuItem *self)
 }
 
 static int
-DESFlagCheck(dialogMenuItem *item)
+CRYPTOFlagCheck(dialogMenuItem *item)
 {
-    return DESDists;
+    return CRYPTODists;
 }
 
 static int
@@ -232,7 +232,7 @@ DMenu MenuIndex = {
       { " Disklabel",		"The disk Label editor",		NULL, diskLabelEditor },
       { " Dists, All",		"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
       { " Dists, Basic",		"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
-      { " Dists, DES",		"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
+      { " Dists, CRYPTO",	"Encryption distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuCRYPTODistributions },
       { " Dists, Developer",	"Select developer's distribution.",	checkDistDeveloper, distSetDeveloper },
       { " Dists, Src",		"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
       { " Dists, X Developer",	"Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
@@ -807,7 +807,8 @@ DMenu MenuSubDistributions = {
     "Select the distributions you wish to install.",
     "Please check off the distributions you wish to install.  At the\n"
     "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
-    "DES distribution out of the U.S.!  It is for U.S. customers only.",
+    "Encryption distribution out of the U.S.!\n"
+    "It is for U.S. customers only.",
     NULL,
     NULL,
     { { "X Exit", "Exit this menu (returning to previous)",
@@ -832,8 +833,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X },
 #endif
 #endif
-      { " DES",		"DES encryption code - NOT FOR EXPORT!",
-	DESFlagCheck,	distSetDES },
+      { " CRYPTO",	"Encryption code - NOT FOR EXPORT!",
+	CRYPTOFlagCheck,distSetCRYPTO },
       { " dict",	"Spelling checker dictionary files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
       { " doc",		"Miscellaneous FreeBSD online docs",
@@ -848,7 +849,7 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
       { " proflibs",	"Profiled versions of the libraries",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
-      { " src",		"Sources for everything but DES",
+      { " src",		"Sources for everything but encryption",
 	srcFlagCheck,	distSetSrc },
       { " ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
@@ -863,10 +864,10 @@ DMenu MenuSubDistributions = {
       { NULL } },
 };
 
-DMenu MenuDESDistributions = {
+DMenu MenuCRYPTODistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the encryption facilities you wish to install.",
-    "Please check off any special DES-based encryption distributions\n"
+    "Please check off any special encryption distributions\n"
     "you would like to install.  Please note that these services are NOT FOR\n"
     "EXPORT from the United States.  For information on non-U.S. FTP\n"
     "distributions of this software, please consult the release notes.",
@@ -875,24 +876,28 @@ DMenu MenuDESDistributions = {
     { { "X Exit", "Exit this menu (returning to previous)",
 	checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
       { "All",		"Select all of the below",
-	NULL,		setDES, NULL, NULL, ' ', ' ', ' ' },
+	NULL,		setCRYPTO, NULL, NULL, ' ', ' ', ' ' },
       { "Reset",	"Reset all of the below",
-	NULL,		clearDES, NULL, NULL, ' ', ' ', ' ' },
-      { " des",		"Basic DES encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-#if __FreeBSD__ > 3
-      { " krb4",	"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 },
-#else
+	NULL,		clearCRYPTO, NULL, NULL, ' ', ' ', ' ' },
+      { " crypto",	"Basic encryption services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
+#if __FreeBSD__ <= 3
       { " krb",		"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS },
+#else
+      { " krb4",	"KerberosIV authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 },
+      { " krb5",	"Kerberos5 authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
 #endif
-      { " skerbero",	"Sources for Kerberos",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS },
-      { " ssecure",	"Sources for DES",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
-      { " scrypto",	"Export controlled crypto sources",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SCRYPTO },
+      { " skrb4",	"Sources for KerberosIV",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS4 },
+      { " skrb5",	"Sources for Kerberos5",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
+      { " ssecure",	"BSD encryption sources",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE },
+      { " scrypto",	"Contributed encryption sources",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
       { NULL } },
 };
 
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 66b10d1..7c46a83 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -388,8 +388,8 @@ Profiled libraries for developers.
 Dictionary information (for tools like spell).
 .It Li info
 GNU info files and other extra docs.
-.It Li des
-DES encryption binaries and libraries.
+.It Li crypto
+Encryption binaries and libraries.
 .It Li compat1x
 Compatibility with
 .It Li 1.x
@@ -571,8 +571,8 @@ Selects the very minimum distribution set.
 Selects the full whack - all available distributions.
 .Pp
 \fBVariables:\fR None
-.It distSetDES
-Interactively select DES subcomponents.
+.It distSetCRYPTO
+Interactively select encryption subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetSrc
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 48c3939..a07d4fe 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -92,7 +92,7 @@
 #define VAR_DISK			"disk"
 #define VAR_DISTS			"dists"
 #define VAR_DIST_MAIN			"distMain"
-#define VAR_DIST_DES			"distDES"
+#define VAR_DIST_CRYPTO			"distCRYPTO"
 #define VAR_DIST_SRC			"distSRC"
 #define VAR_DIST_X11			"distX11"
 #define VAR_DIST_XSERVER		"distXserver"
@@ -344,7 +344,7 @@ Boolean			USAResident;		/* Are we cryptographically challenged? */
 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	DESDists;		/* Which naughty 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			*/
@@ -381,7 +381,7 @@ extern DMenu		MenuInstallCustom;	/* Custom Installation menu			*/
 extern DMenu		MenuDistributions;	/* Distribution menu				*/
 extern DMenu		MenuDiskDevices;	/* Disk type devices				*/
 extern DMenu		MenuSubDistributions;	/* Custom distribution menu			*/
-extern DMenu		MenuDESDistributions;	/* DES distribution menu			*/
+extern DMenu		MenuCRYPTODistributions;/* Encryption distribution menu			*/
 extern DMenu		MenuSrcDistributions;	/* Source distribution menu			*/
 extern DMenu		MenuXF86;		/* XFree86 main menu				*/
 extern DMenu		MenuXF86Select;		/* XFree86 distribution selection menu		*/
@@ -490,7 +490,7 @@ extern int	distSetUser(dialogMenuItem *self);
 extern int	distSetXUser(dialogMenuItem *self);
 extern int	distSetMinimum(dialogMenuItem *self);
 extern int	distSetEverything(dialogMenuItem *self);
-extern int	distSetDES(dialogMenuItem *self);
+extern int	distSetCRYPTO(dialogMenuItem *self);
 extern int	distSetSrc(dialogMenuItem *self);
 extern int	distSetXF86(dialogMenuItem *self);
 extern int	distExtractAll(dialogMenuItem *self);
diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c
index 7d8dc9c..0b388b4 100644
--- a/usr.sbin/sysinstall/dispatch.c
+++ b/usr.sbin/sysinstall/dispatch.c
@@ -73,7 +73,7 @@ static struct _word {
     { "distSetXUser",		distSetXUser		},
     { "distSetMinimum",		distSetMinimum		},
     { "distSetEverything",	distSetEverything	},
-    { "distSetDES",		distSetDES		},
+    { "distSetCRYPTO",		distSetCRYPTO		},
     { "distSetSrc",		distSetSrc		},
     { "distSetXF86",		distSetXF86		},
     { "distExtractAll",		distExtractAll		},
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 6db4ac6..16a6699 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -40,7 +40,7 @@
 #include <libutil.h>
 
 unsigned int Dists;
-unsigned int DESDists;
+unsigned int CRYPTODists;
 unsigned int SrcDists;
 unsigned int XF86Dists;
 unsigned int XF86ServerDists;
@@ -55,7 +55,7 @@ typedef struct _dist {
 } Distribution;
 
 extern Distribution DistTable[];
-extern Distribution DESDistTable[];
+extern Distribution CRYPTODistTable[];
 extern Distribution SrcDistTable[];
 extern Distribution XF86DistTable[];
 extern Distribution XF86FontDistTable[];
@@ -72,33 +72,29 @@ static Distribution DistTable[] = {
 { "dict",	"/",			&Dists,		DIST_DICT,		NULL		},
 { "info",	"/",			&Dists,		DIST_INFO,		NULL		},
 { "src",	"/",			&Dists,		DIST_SRC,		SrcDistTable	},
-{ "des",	"/",			&Dists,		DIST_DES,		DESDistTable	},
+{ "des",	"/",			&Dists,		DIST_CRYPTO,		CRYPTODistTable	},
 #ifdef __i386__
 { "compat1x",	"/",			&Dists,		DIST_COMPAT1X,		NULL		},
 { "compat20",	"/",			&Dists,		DIST_COMPAT20,		NULL		},
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
 { "compat22",	"/",			&Dists,		DIST_COMPAT22,		NULL		},
-#if __FreeBSD__ > 3
 { "compat3x",	"/",			&Dists,		DIST_COMPAT3X,		NULL		},
 #endif
-#endif
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
 { "local",	"/",			&Dists,		DIST_LOCAL,		NULL		},
 { "XF86336",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
 { NULL },
 };
 
-/* The DES distribution (not for export!) */
-static Distribution DESDistTable[] = {
-{ "des",        "/",                    &DESDists,	DIST_DES_DES,		NULL		},
-#if __FreeBSD__ > 3
-{ "krb4",	"/",			&DESDists,	DIST_DES_KERBEROS4,	NULL		},
-#else
-{ "krb",	"/",			&DESDists,	DIST_DES_KERBEROS,	NULL		},
-#endif
-{ "ssecure",	"/usr/src",		&DESDists,	DIST_DES_SSECURE,	NULL		},
-{ "scrypto",	"/usr/src",		&DESDists,	DIST_DES_SCRYPTO,	NULL		},
-{ "skerbero",	"/usr/src",		&DESDists,	DIST_DES_SKERBEROS,	NULL		},
+/* The CRYPTO distribution */
+static Distribution CRYPTODistTable[] = {
+{ "crypto",     "/",                    &CRYPTODists,	DIST_CRYPTO_CRYPTO,		NULL		},
+{ "krb4",	"/",			&CRYPTODists,	DIST_CRYPTO_KERBEROS4,	NULL		},
+{ "krb5",	"/",			&CRYPTODists,	DIST_CRYPTO_KERBEROS5,	NULL		},
+{ "ssecure",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SSECURE,	NULL		},
+{ "scrypto",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SCRYPTO,	NULL		},
+{ "skrb4",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SKERBEROS4,	NULL		},
+{ "skrb5",	"/usr/src",		&CRYPTODists,	DIST_CRYPTO_SKERBEROS5,	NULL		},
 { NULL },
 };
 
@@ -191,19 +187,18 @@ static Distribution XF86FontDistTable[] = {
 { NULL },
 };
 
-static int	distMaybeSetDES(dialogMenuItem *self);
+static int	distMaybeSetCRYPTO(dialogMenuItem *self);
 static int	distMaybeSetPorts(dialogMenuItem *self);
 
-
 static void
 distVerifyFlags(void)
 {
     if (SrcDists)
 	Dists |= DIST_SRC;
-    if (DESDists) {
-	if (DESDists & DIST_DES_KERBEROS4)
-	    DESDists |= DIST_DES_DES;
-	Dists |= DIST_DES;
+    if (CRYPTODists) {
+	if (CRYPTODists & (DIST_CRYPTO_KERBEROS4 | DIST_CRYPTO_KERBEROS5))
+	    CRYPTODists |= DIST_CRYPTO_CRYPTO;
+	Dists |= DIST_CRYPTO;
     }
     if (XF86Dists & DIST_XF86_SET)
 	XF86ServerDists |= DIST_XF86_SERVER_VGA16;
@@ -221,15 +216,15 @@ distVerifyFlags(void)
 #endif
     }
     if (isDebug())
-	msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
-		 Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
+	msgDebug("Dist Masks: Dists: %0x, CRYPTO: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
+		 Dists, CRYPTODists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
 }
 
 int
 distReset(dialogMenuItem *self)
 {
     Dists = 0;
-    DESDists = 0;
+    CRYPTODists = 0;
     SrcDists = 0;
     XF86Dists = 0;
     XF86ServerDists = 0;
@@ -247,8 +242,8 @@ distConfig(dialogMenuItem *self)
     if ((cp = variable_get(VAR_DIST_MAIN)) != NULL)
 	Dists = atoi(cp);
 
-    if ((cp = variable_get(VAR_DIST_DES)) != NULL)
-	DESDists = atoi(cp);
+    if ((cp = variable_get(VAR_DIST_CRYPTO)) != NULL)
+	CRYPTODists = atoi(cp);
 
     if ((cp = variable_get(VAR_DIST_SRC)) != NULL)
 	SrcDists = atoi(cp);
@@ -286,7 +281,7 @@ distSetDeveloper(dialogMenuItem *self)
     distReset(NULL);
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_ALL;
-    i = distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i = distMaybeSetCRYPTO(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
 }
@@ -310,7 +305,7 @@ distSetKernDeveloper(dialogMenuItem *self)
     distReset(NULL);
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_SYS;
-    i = distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i = distMaybeSetCRYPTO(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
 }
@@ -333,7 +328,7 @@ distSetUser(dialogMenuItem *self)
 
     distReset(NULL);
     Dists = _DIST_USER;
-    i = distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i = distMaybeSetCRYPTO(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
 }
@@ -367,18 +362,18 @@ distSetEverything(dialogMenuItem *self)
     XF86Dists = DIST_XF86_ALL;
     XF86ServerDists = DIST_XF86_SERVER_ALL;
     XF86FontDists = DIST_XF86_FONTS_ALL;
-    i = distMaybeSetDES(self) | distMaybeSetPorts(self);
+    i = distMaybeSetCRYPTO(self) | distMaybeSetPorts(self);
     distVerifyFlags();
     return i;
 }
 
 int
-distSetDES(dialogMenuItem *self)
+distSetCRYPTO(dialogMenuItem *self)
 {
     int i;
 
     dialog_clear_norefresh();
-    if (!dmenuOpenSimple(&MenuDESDistributions, FALSE))
+    if (!dmenuOpenSimple(&MenuCRYPTODistributions, FALSE))
 	i = DITEM_FAILURE;
     else
 	i = DITEM_SUCCESS;
@@ -387,7 +382,7 @@ distSetDES(dialogMenuItem *self)
 }
 
 static int
-distMaybeSetDES(dialogMenuItem *self)
+distMaybeSetCRYPTO(dialogMenuItem *self)
 {
     int i = DITEM_SUCCESS | DITEM_REDRAW;
 
@@ -395,14 +390,14 @@ distMaybeSetDES(dialogMenuItem *self)
     if (!msgYesNo("Do you wish to install cryptographic software?\n\n"
 		  "If you choose No, FreeBSD will use an MD5 based password scheme which,\n"
 		  "while perhaps more secure, is not interoperable with the traditional\n"
-		  "UNIX DES passwords on other Unix systems.  There will also be some\n"
+		  "DES-based passwords on other Unix systems.  There will also be some\n"
 		  "differences in the type of RSA code you use.\n\n"
 		  "Please do NOT choose Yes at this point if you are outside the\n"
-		  "United States and Canada yet are installing from a U.S. FTP server.\n"
-		  "Instead, install everything BUT the crypto bits from the U.S. site\n"
-		  "and then switch to an international FTP server to install them on\n"
-		  "a second pass using the Custom Installation option.")) {
-	if (!dmenuOpenSimple(&MenuDESDistributions, FALSE))
+		  "United States and Canada and are installing from a U.S. FTP server.\n"
+		  "Instead, install everything but the crypto bits from the U.S. site\n"
+		  "and then switch to an international FTP server to install crypto on\n"
+		  "a second pass with the Custom Installation option.")) {
+	if (!dmenuOpenSimple(&MenuCRYPTODistributions, FALSE))
 	    i = DITEM_FAILURE;
 	else
 	    USAResident = TRUE;
@@ -803,7 +798,7 @@ distExtract(char *parent, Distribution *me)
 		    goto punt;
 		}
 	    } else {
-		for(j = 0; j < realsize; j++) {
+		for (j = 0; j < realsize; j++) {
 		    /* On finding CRLF, skip the CR; don't exceed end of buffer. */
 		    if ((buf[j] != 0x0d) || (j == total - 1) || (buf[j + 1] != 0x0a)) {
 			retval = write(fd2, buf + j, 1);
@@ -831,9 +826,7 @@ distExtract(char *parent, Distribution *me)
 	    dialog_clear_norefresh();
 	    if (me[i].my_dist) {
 		msgConfirm("Unable to transfer all components of the %s distribution.\n"
-			   "If this is a CDROM install, it may be because export restrictions prohibit\n"
-			   "DES code from being shipped from the U.S.  Try to get this code from a\n"
-			   "local FTP site instead!", me[i].my_name);
+		           "You may wish to switch media types and try again.\n", me[i].my_name);
 	    }
 	    else {
 		status = msgYesNo("Unable to transfer the %s distribution from\n%s.\n\n"
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index 5dc0620..c873c38 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -20,7 +20,7 @@
 #define DIST_COMPAT3X		0x01000
 #endif
 #define DIST_XF86		0x02000
-#define DIST_DES		0x04000
+#define DIST_CRYPTO		0x04000
 #define DIST_CATPAGES		0x08000
 #define DIST_PORTS		0x10000
 #define DIST_LOCAL		0x20000
@@ -33,17 +33,19 @@
 #define _DIST_USER \
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT )
 
-/* Subtypes for DES distribution */
-#define DIST_DES_DES		0x0001
-#define DIST_DES_SCRYPTO	0x0002
-#define DIST_DES_SSECURE	0x0004
-#if __FreeBSD__ > 3
-#define DIST_DES_KERBEROS4	0x0008
+/* Subtypes for CRYPTO distribution */
+#define DIST_CRYPTO_CRYPTO	0x0001
+#define DIST_CRYPTO_SCRYPTO	0x0002
+#define DIST_CRYPTO_SSECURE	0x0004
+#if __FreeBSD__ <= 3
+#define DIST_CRYPTO_KERBEROS	0x0008
 #else
-#define DIST_DES_KERBEROS	0x0008
+#define DIST_CRYPTO_KERBEROS4	0x0008
+#define DIST_CRYPTO_KERBEROS5	0x0010
+#define DIST_CRYPTO_SKERBEROS4	0x0020
+#define DIST_CRYPTO_SKERBEROS5	0x0040
 #endif
-#define DIST_DES_SKERBEROS	0x0010
-#define DIST_DES_ALL		0x001F
+#define DIST_CRYPTO_ALL		0x007F
 
 /* Subtypes for SRC distribution */
 #define DIST_SRC_BASE		0x00001
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 60152b0..83972b0 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -201,10 +201,10 @@ installInitial(void)
     if (!variable_get(VAR_NO_WARN))
 	if (msgYesNo(
 	    "Last Chance!  Are you SURE you want continue the installation?\n\n"
-	     "If you're running this on a disk with data you wish to save\n"
-	     "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n"
-	     "proceeding!\n\n"
-	     "We can take no responsibility for lost disk contents!") != 0)
+	    "If you're running this on a disk with data you wish to save\n"
+	    "then WE STRONGLY ENCOURAGE YOU TO MAKE PROPER BACKUPS before\n"
+	    "proceeding!\n\n"
+	    "We can take no responsibility for lost disk contents!") != 0)
 	return DITEM_FAILURE;
 
     if (DITEM_STATUS(diskLabelCommit(NULL)) != DITEM_SUCCESS) {
@@ -538,11 +538,11 @@ nodisks:
     }
 
     if (msgYesNo("Will this machine be a leaf node (e.g. will not forward packets)\n"
-		  "between interfaces)?"))
+		 "between interfaces)?"))
 	variable_set2("gateway_enable", "YES", 1);
 
     if (msgYesNo("Do you want to grant only normal users FTP access to this\n"
-	           "host (e.g. no anonymous FTP connections)?"))
+	         "host (e.g. no anonymous FTP connections)?"))
 	configAnonFTP(self);
 
     if (!msgYesNo("Do you want to configure this machine as an NFS server?"))
@@ -630,7 +630,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 DES dist.
+ * then use ftp to load just the CRYPTO dist.
  */
 int
 installCommit(dialogMenuItem *self)
@@ -757,7 +757,7 @@ installFixupBin(dialogMenuItem *self)
 	for (i = 0; devs[i]; i++) {
 	    Disk *disk = (Disk *)devs[i]->private;
 	    Chunk *c1;
-	    
+
 	    if (!devs[i]->enabled)
 		continue;
 	    if (!disk->chunks)
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index d1e5bbc..c294bc3 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -61,18 +61,18 @@ clearSrc(dialogMenuItem *self)
 }
 
 static int
-setDES(dialogMenuItem *self)
+setCRYPTO(dialogMenuItem *self)
 {
-    Dists |= DIST_DES;
-    DESDists = DIST_DES_ALL;
+    Dists |= DIST_CRYPTO;
+    CRYPTODists = DIST_CRYPTO_ALL;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
 static int
-clearDES(dialogMenuItem *self)
+clearCRYPTO(dialogMenuItem *self)
 {
-    Dists &= ~DIST_DES;
-    DESDists = 0;
+    Dists &= ~DIST_CRYPTO;
+    CRYPTODists = 0;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 
@@ -128,10 +128,10 @@ clearX11Fonts(dialogMenuItem *self)
 #define _IS_SET(dist, set) (((dist) & (set)) == (set))
 
 #define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
-	_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
+	_IS_SET(dist, _DIST_DEVELOPER | DIST_CRYPTO | extra))
 
 #define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
-	_IS_SET(dist, _DIST_USER | DIST_DES | extra))
+	_IS_SET(dist, _DIST_USER | DIST_CRYPTO | extra))
 
 static int
 checkDistDeveloper(dialogMenuItem *self)
@@ -185,9 +185,9 @@ checkDistEverything(dialogMenuItem *self)
 }
 
 static int
-DESFlagCheck(dialogMenuItem *item)
+CRYPTOFlagCheck(dialogMenuItem *item)
 {
-    return DESDists;
+    return CRYPTODists;
 }
 
 static int
@@ -232,7 +232,7 @@ DMenu MenuIndex = {
       { " Disklabel",		"The disk Label editor",		NULL, diskLabelEditor },
       { " Dists, All",		"Root of the distribution tree.",	NULL, dmenuSubmenu, NULL, &MenuDistributions },
       { " Dists, Basic",		"Basic FreeBSD distribution menu.",	NULL, dmenuSubmenu, NULL, &MenuSubDistributions },
-      { " Dists, DES",		"DES distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuDESDistributions },
+      { " Dists, CRYPTO",	"Encryption distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuCRYPTODistributions },
       { " Dists, Developer",	"Select developer's distribution.",	checkDistDeveloper, distSetDeveloper },
       { " Dists, Src",		"Src distribution menu.",		NULL, dmenuSubmenu, NULL, &MenuSrcDistributions },
       { " Dists, X Developer",	"Select X developer's distribution.",	checkDistXDeveloper, distSetXDeveloper },
@@ -807,7 +807,8 @@ DMenu MenuSubDistributions = {
     "Select the distributions you wish to install.",
     "Please check off the distributions you wish to install.  At the\n"
     "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
-    "DES distribution out of the U.S.!  It is for U.S. customers only.",
+    "Encryption distribution out of the U.S.!\n"
+    "It is for U.S. customers only.",
     NULL,
     NULL,
     { { "X Exit", "Exit this menu (returning to previous)",
@@ -832,8 +833,8 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT3X },
 #endif
 #endif
-      { " DES",		"DES encryption code - NOT FOR EXPORT!",
-	DESFlagCheck,	distSetDES },
+      { " CRYPTO",	"Encryption code - NOT FOR EXPORT!",
+	CRYPTOFlagCheck,distSetCRYPTO },
       { " dict",	"Spelling checker dictionary files",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
       { " doc",		"Miscellaneous FreeBSD online docs",
@@ -848,7 +849,7 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
       { " proflibs",	"Profiled versions of the libraries",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
-      { " src",		"Sources for everything but DES",
+      { " src",		"Sources for everything but encryption",
 	srcFlagCheck,	distSetSrc },
       { " ports",	"The FreeBSD Ports collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
@@ -863,10 +864,10 @@ DMenu MenuSubDistributions = {
       { NULL } },
 };
 
-DMenu MenuDESDistributions = {
+DMenu MenuCRYPTODistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the encryption facilities you wish to install.",
-    "Please check off any special DES-based encryption distributions\n"
+    "Please check off any special encryption distributions\n"
     "you would like to install.  Please note that these services are NOT FOR\n"
     "EXPORT from the United States.  For information on non-U.S. FTP\n"
     "distributions of this software, please consult the release notes.",
@@ -875,24 +876,28 @@ DMenu MenuDESDistributions = {
     { { "X Exit", "Exit this menu (returning to previous)",
 	checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
       { "All",		"Select all of the below",
-	NULL,		setDES, NULL, NULL, ' ', ' ', ' ' },
+	NULL,		setCRYPTO, NULL, NULL, ' ', ' ', ' ' },
       { "Reset",	"Reset all of the below",
-	NULL,		clearDES, NULL, NULL, ' ', ' ', ' ' },
-      { " des",		"Basic DES encryption services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
-#if __FreeBSD__ > 3
-      { " krb4",	"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS4 },
-#else
+	NULL,		clearCRYPTO, NULL, NULL, ' ', ' ', ' ' },
+      { " crypto",	"Basic encryption services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_CRYPTO, },
+#if __FreeBSD__ <= 3
       { " krb",		"KerberosIV authentication services",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS },
+#else
+      { " krb4",	"KerberosIV authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS4 },
+      { " krb5",	"Kerberos5 authentication services",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_KERBEROS5 },
 #endif
-      { " skerbero",	"Sources for Kerberos",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SKERBEROS },
-      { " ssecure",	"Sources for DES",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
-      { " scrypto",	"Export controlled crypto sources",
-	dmenuFlagCheck,	dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SCRYPTO },
+      { " skrb4",	"Sources for KerberosIV",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS4 },
+      { " skrb5",	"Sources for Kerberos5",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SKERBEROS5 },
+      { " ssecure",	"BSD encryption sources",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SSECURE },
+      { " scrypto",	"Contributed encryption sources",
+	dmenuFlagCheck,	dmenuSetFlag, NULL, &CRYPTODists, '[', 'X', ']', DIST_CRYPTO_SCRYPTO },
       { NULL } },
 };
 
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index 66b10d1..7c46a83 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -388,8 +388,8 @@ Profiled libraries for developers.
 Dictionary information (for tools like spell).
 .It Li info
 GNU info files and other extra docs.
-.It Li des
-DES encryption binaries and libraries.
+.It Li crypto
+Encryption binaries and libraries.
 .It Li compat1x
 Compatibility with
 .It Li 1.x
@@ -571,8 +571,8 @@ Selects the very minimum distribution set.
 Selects the full whack - all available distributions.
 .Pp
 \fBVariables:\fR None
-.It distSetDES
-Interactively select DES subcomponents.
+.It distSetCRYPTO
+Interactively select encryption subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetSrc
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 48c3939..a07d4fe 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -92,7 +92,7 @@
 #define VAR_DISK			"disk"
 #define VAR_DISTS			"dists"
 #define VAR_DIST_MAIN			"distMain"
-#define VAR_DIST_DES			"distDES"
+#define VAR_DIST_CRYPTO			"distCRYPTO"
 #define VAR_DIST_SRC			"distSRC"
 #define VAR_DIST_X11			"distX11"
 #define VAR_DIST_XSERVER		"distXserver"
@@ -344,7 +344,7 @@ Boolean			USAResident;		/* Are we cryptographically challenged? */
 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	DESDists;		/* Which naughty 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			*/
@@ -381,7 +381,7 @@ extern DMenu		MenuInstallCustom;	/* Custom Installation menu			*/
 extern DMenu		MenuDistributions;	/* Distribution menu				*/
 extern DMenu		MenuDiskDevices;	/* Disk type devices				*/
 extern DMenu		MenuSubDistributions;	/* Custom distribution menu			*/
-extern DMenu		MenuDESDistributions;	/* DES distribution menu			*/
+extern DMenu		MenuCRYPTODistributions;/* Encryption distribution menu			*/
 extern DMenu		MenuSrcDistributions;	/* Source distribution menu			*/
 extern DMenu		MenuXF86;		/* XFree86 main menu				*/
 extern DMenu		MenuXF86Select;		/* XFree86 distribution selection menu		*/
@@ -490,7 +490,7 @@ extern int	distSetUser(dialogMenuItem *self);
 extern int	distSetXUser(dialogMenuItem *self);
 extern int	distSetMinimum(dialogMenuItem *self);
 extern int	distSetEverything(dialogMenuItem *self);
-extern int	distSetDES(dialogMenuItem *self);
+extern int	distSetCRYPTO(dialogMenuItem *self);
 extern int	distSetSrc(dialogMenuItem *self);
 extern int	distSetXF86(dialogMenuItem *self);
 extern int	distExtractAll(dialogMenuItem *self);