remove nonstandard DES support because DES. ok beck deraadt miod

6 files changed, 10 insertions, 463 deletions

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index f9333bfcb64..c1c5b031b42 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.9 2010/01/04 17:50:37 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2014/04/14 22:12:01 tedu Exp $
 
 PROG=	ed
-CFLAGS+=-DBACKWARDS -DDES
-SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+CFLAGS+=-DBACKWARDS
+SRCS=	 buf.c glbl.c io.c main.c re.c sub.c undo.c
 
 #LINKS=  ${BINDIR}/ed ${BINDIR}/red
 #MLINKS= ed.1 red.1
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
deleted file mode 100644
index da1304799a8..00000000000
--- a/bin/ed/cbc.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*	$OpenBSD: cbc.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $	*/
-/*	$NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $	*/
-
-/* cbc.c: This file contains the encryption routines for the ed line editor */
-/*-
- * Copyright (c) 1993 The Regents of the University of California.
- * All rights reserved.
- *
- * Copyright (c) 1993 Andrew Moore, Talke Studio.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- */
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <errno.h>
-#include <pwd.h>
-
-#include "ed.h"
-
-
-/*
- * BSD and System V systems offer special library calls that do
- * block move_liness and fills, so if possible we take advantage of them
- */
-#define	MEMCPY(dest,src,len)	memcpy((dest),(src),(len))
-#define	MEMZERO(dest,len)	memset((dest), 0, (len))
-
-/* Hide the calls to the primitive encryption routines. */
-#define	DES_KEY(buf) \
-	if (des_setkey(buf)) \
-		des_error("des_setkey");
-#define	DES_XFORM(buf) \
-	if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \
-		des_error("des_cipher");
-
-/*
- * read/write - no error checking
- */
-#define	READ(buf, n, fp)	fread(buf, sizeof(char), n, fp)
-#define WRITE(buf, n, fp)	fwrite(buf, sizeof(char), n, fp)
-
-/*
- * some things to make references easier
- */
-typedef char Desbuf[8];
-#define	CHAR(x,i)	(x[i])
-#define	UCHAR(x,i)	(x[i])
-#define	BUFFER(x)	(x)
-#define	UBUFFER(x)	(x)
-
-/*
- * global variables and related macros
- */
-
-Desbuf ivec;				/* initialization vector */
-Desbuf pvec;				/* padding vector */
-char bits[] = {				/* used to extract bits from a char */
-	'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
-};
-int pflag;				/* 1 to preserve parity bits */
-
-unsigned char des_buf[8];	/* shared buffer for get_des_char/put_des_char */
-int des_ct = 0;			/* count for get_des_char/put_des_char */
-int des_n = 0;			/* index for put_des_char/get_des_char */
-
-
-/* init_des_cipher: initialize DES */
-void
-init_des_cipher(void)
-{
-#ifdef DES
-	int i;
-
-	des_ct = des_n = 0;
-
-	/* initialize the initialization vector */
-	MEMZERO(ivec, 8);
-
-	for (i = 0; i < 8; i++)
-		CHAR(pvec, i) = (char) arc4random();
-#endif
-}
-
-
-/* get_des_char: return next char in an encrypted file */
-int
-get_des_char(FILE *fp)
-{
-#ifdef DES
-	if (des_n >= des_ct) {
-		des_n = 0;
-		des_ct = cbc_decode((char *)des_buf, fp);
-	}
-	return (des_ct > 0) ? des_buf[des_n++] : EOF;
-#endif
-}
-
-
-/* put_des_char: write a char to an encrypted file; return char written */
-int
-put_des_char(int c, FILE *fp)
-{
-#ifdef DES
-	if (des_n == sizeof des_buf) {
-		des_ct = cbc_encode((char *)des_buf, des_n, fp);
-		des_n = 0;
-	}
-	return (des_ct >= 0) ? (des_buf[des_n++] = c) : EOF;
-#endif
-}
-
-
-/* flush_des_file: flush an encrypted file's output; return status */
-int
-flush_des_file(FILE *fp)
-{
-#ifdef DES
-	if (des_n == sizeof des_buf) {
-		des_ct = cbc_encode((char *)des_buf, des_n, fp);
-		des_n = 0;
-	}
-	return (des_ct >= 0 && cbc_encode((char *)des_buf, des_n, fp) >= 0) ? 0 : EOF;
-#endif
-}
-
-#ifdef DES
-/*
- * get keyword from tty or stdin
- */
-int
-get_keyword(void)
-{
-	char *p;			/* used to obtain the key */
-	Desbuf msgbuf;			/* I/O buffer */
-
-	/*
-	 * get the key
-	 */
-	if ((p = getpass("Enter key: ")) != NULL && *p != '\0') {
-
-		/*
-		 * copy it, nul-padded, into the key area
-		 */
-		expand_des_key(BUFFER(msgbuf), p);
-		MEMZERO(p, _PASSWORD_LEN);
-		set_des_key(msgbuf);
-		MEMZERO(msgbuf, sizeof msgbuf);
-		return 1;
-	}
-	return 0;
-}
-
-
-/*
- * print a warning message and, possibly, terminate
- */
-void
-des_error(char *s)
-{
-	seterrmsg(s ? s : strerror(errno));
-}
-
-/*
- * map a hex character to an integer
- */
-int
-hex_to_binary(int c, int radix)
-{
-	switch(c) {
-	case '0':		return(0x0);
-	case '1':		return(0x1);
-	case '2':		return(radix > 2 ? 0x2 : -1);
-	case '3':		return(radix > 3 ? 0x3 : -1);
-	case '4':		return(radix > 4 ? 0x4 : -1);
-	case '5':		return(radix > 5 ? 0x5 : -1);
-	case '6':		return(radix > 6 ? 0x6 : -1);
-	case '7':		return(radix > 7 ? 0x7 : -1);
-	case '8':		return(radix > 8 ? 0x8 : -1);
-	case '9':		return(radix > 9 ? 0x9 : -1);
-	case 'A': case 'a':	return(radix > 10 ? 0xa : -1);
-	case 'B': case 'b':	return(radix > 11 ? 0xb : -1);
-	case 'C': case 'c':	return(radix > 12 ? 0xc : -1);
-	case 'D': case 'd':	return(radix > 13 ? 0xd : -1);
-	case 'E': case 'e':	return(radix > 14 ? 0xe : -1);
-	case 'F': case 'f':	return(radix > 15 ? 0xf : -1);
-	}
-	/*
-	 * invalid character
-	 */
-	return(-1);
-}
-
-/*
- * convert the key to a bit pattern
- */
-void
-expand_des_key(char *obuf, char *ibuf)
-{
-	int i, j;			/* counter in a for loop */
-	int nbuf[64];			/* used for hex/key translation */
-
-	/*
-	 * leading '0x' or '0X' == hex key
-	 */
-	if (ibuf[0] == '0' && (ibuf[1] == 'x' || ibuf[1] == 'X')) {
-		ibuf = &ibuf[2];
-		/*
-		 * now translate it, bombing on any illegal hex digit
-		 */
-		for (i = 0; ibuf[i] && i < 16; i++)
-			if ((nbuf[i] = hex_to_binary((int) ibuf[i], 16)) == -1)
-				des_error("bad hex digit in key");
-		while (i < 16)
-			nbuf[i++] = 0;
-		for (i = 0; i < 8; i++)
-			obuf[i] =
-			    ((nbuf[2*i]&0xf)<<4) | (nbuf[2*i+1]&0xf);
-		/* preserve parity bits */
-		pflag = 1;
-		return;
-	}
-	/*
-	 * leading '0b' or '0B' == binary key
-	 */
-	if (ibuf[0] == '0' && (ibuf[1] == 'b' || ibuf[1] == 'B')) {
-		ibuf = &ibuf[2];
-		/*
-		 * now translate it, bombing on any illegal binary digit
-		 */
-		for (i = 0; ibuf[i] && i < 16; i++)
-			if ((nbuf[i] = hex_to_binary((int) ibuf[i], 2)) == -1)
-				des_error("bad binary digit in key");
-		while (i < 64)
-			nbuf[i++] = 0;
-		for (i = 0; i < 8; i++)
-			for (j = 0; j < 8; j++)
-				obuf[i] = (obuf[i]<<1)|nbuf[8*i+j];
-		/* preserve parity bits */
-		pflag = 1;
-		return;
-	}
-	/*
-	 * no special leader -- ASCII
-	 */
-	strncpy(obuf, ibuf, 8);		/* XXX ? */
-}
-
-/*****************
- * DES FUNCTIONS *
- *****************/
-/*
- * This sets the DES key and (if you're using the deszip version)
- * the direction of the transformation.  This uses the Sun
- * to map the 64-bit key onto the 56 bits that the key schedule
- * generation routines use: the old way, which just uses the user-
- * supplied 64 bits as is, and the new way, which resets the parity
- * bit to be the same as the low-order bit in each character.  The
- * new way generates a greater variety of key schedules, since many
- * systems set the parity (high) bit of each character to 0, and the
- * DES ignores the low order bit of each character.
- */
-void
-set_des_key(Desbuf buf)
-{
-	int i, j;				/* counter in a for loop */
-	int par;				/* parity counter */
-
-	/*
-	 * if the parity is not preserved, flip it
-	 */
-	if (!pflag) {
-		for (i = 0; i < 8; i++) {
-			par = 0;
-			for (j = 1; j < 8; j++)
-				if ((bits[j]&UCHAR(buf, i)) != 0)
-					par++;
-			if ((par&01) == 01)
-				UCHAR(buf, i) = UCHAR(buf, i)&0177;
-			else
-				UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200;
-		}
-	}
-
-	DES_KEY(UBUFFER(buf));
-}
-
-
-/*
- * This encrypts using the Cipher Block Chaining mode of DES
- */
-int
-cbc_encode(char *msgbuf, int n, FILE *fp)
-{
-	int inverse = 0;	/* 0 to encrypt, 1 to decrypt */
-
-	/*
-	 * do the transformation
-	 */
-	if (n == 8) {
-		for (n = 0; n < 8; n++)
-			CHAR(msgbuf, n) ^= CHAR(ivec, n);
-		DES_XFORM(UBUFFER(msgbuf));
-		MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8);
-		return WRITE(BUFFER(msgbuf), 8, fp);
-	}
-	/*
-	 * at EOF or last block -- in either case, the last byte contains
-	 * the character representation of the number of bytes in it
-	 */
-/*
-	MEMZERO(msgbuf +  n, 8 - n);
-*/
-	/*
-	 *  Pad the last block randomly
-	 */
-	(void)MEMCPY(BUFFER(msgbuf + n), BUFFER(pvec), 8 - n);
-	CHAR(msgbuf, 7) = n;
-	for (n = 0; n < 8; n++)
-		CHAR(msgbuf, n) ^= CHAR(ivec, n);
-	DES_XFORM(UBUFFER(msgbuf));
-	return WRITE(BUFFER(msgbuf), 8, fp);
-}
-
-/*
- * This decrypts using the Cipher Block Chaining mode of DES
- */
-int
-cbc_decode(char *msgbuf, FILE *fp)
-{
-	Desbuf ibuf;		/* temp buffer for initialization vector */
-	int n;			/* number of bytes actually read */
-	int c;			/* used to test for EOF */
-	int inverse = 1;	/* 0 to encrypt, 1 to decrypt */
-
-	if ((n = READ(BUFFER(msgbuf), 8, fp)) == 8) {
-		/*
-		 * do the transformation
-		 */
-		MEMCPY(BUFFER(ibuf), BUFFER(msgbuf), 8);
-		DES_XFORM(UBUFFER(msgbuf));
-		for (c = 0; c < 8; c++)
-			UCHAR(msgbuf, c) ^= UCHAR(ivec, c);
-		MEMCPY(BUFFER(ivec), BUFFER(ibuf), 8);
-		/*
-		 * if the last one, handle it specially
-		 */
-		if ((c = fgetc(fp)) == EOF) {
-			n = CHAR(msgbuf, 7);
-			if (n < 0 || n > 7) {
-				des_error("decryption failed (block corrupted)");
-				return EOF;
-			}
-		} else
-			(void)ungetc(c, fp);
-		return n;
-	}
-	if (n > 0)
-		des_error("decryption failed (incomplete block)");
-	else if (n < 0)
-		des_error("cannot read file");
-	return EOF;
-}
-#endif	/* DES */
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index a3d94390a3e..f27404e7bd8 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ed.1,v 1.59 2014/03/06 17:37:43 jmc Exp $
+.\"	$OpenBSD: ed.1,v 1.60 2014/04/14 22:12:01 tedu Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Moore, Talke Studio.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 6 2014 $
+.Dd $Mdocdate: April 14 2014 $
 .Dt ED 1
 .Os
 .Sh NAME
@@ -144,11 +144,6 @@ Suppress diagnostics.
 This should be used if
 .Nm
 standard input is from a script.
-.It Fl x
-Prompt for an encryption key to be used in subsequent reads and writes
-(see the
-.Ic x
-command).
 .It Ar file
 Specifies the name of a file to read.
 If
@@ -671,13 +666,6 @@ This is similar to the
 .Ic w
 command, except that the previous contents of file are not clobbered.
 The current address is unchanged.
-.It Ic x
-Prompts for an encryption key which is used in subsequent reads and writes.
-If a newline alone is entered as the key, then encryption is turned off.
-Otherwise, echoing is disabled while a key is read.
-Encryption/decryption is done using the
-.Xr bdes 1
-algorithm.
 .It (.+1) Ns Ic z Ns Ar n
 Scrolls
 .Ar n
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 5328cd9db45..47349f22d7f 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ed.h,v 1.12 2012/12/04 02:40:47 deraadt Exp $	*/
+/*	$OpenBSD: ed.h,v 1.13 2014/04/14 22:12:01 tedu Exp $	*/
 /*	$NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $	*/
 
 /* ed.h: type and constant definitions for the ed editor. */
@@ -164,20 +164,16 @@ void clear_undo_stack(void);
 int close_sbuf(void);
 int copy_lines(int);
 int delete_lines(int, int);
-void des_error(char *);
 int display_lines(int, int, int);
 line_t *dup_line_node(line_t *);
 int exec_command(void);
 int exec_global(int, int);
-void expand_des_key(char *, char *);
 int extract_addr_range(void);
 char *extract_pattern(int);
 int extract_subst_tail(int *, int *);
 char *extract_subst_template(void);
-int flush_des_file(FILE *);
 line_t *get_addressed_line_node(int);
 pattern_t *get_compiled_pattern(void);
-int get_des_char(FILE *);
 char *get_extended_line(int *, int);
 char *get_filename(void);
 int get_keyword(void);
@@ -194,7 +190,6 @@ void handle_winch(int);
 int has_trailing_escape(char *, char *);
 int hex_to_binary(int, int);
 void init_buffers(void);
-void init_des_cipher(void);
 int is_legal_filename(char *);
 int join_lines(int, int);
 int mark_line_node(line_t *, int);
@@ -205,7 +200,6 @@ int open_sbuf(void);
 char *parse_char_class(char *);
 int pop_undo_stack(void);
 undo_t *push_undo_stack(int, int, int);
-int put_des_char(int, FILE *);
 char *put_sbuf_line(char *);
 int put_stream_line(FILE *, char *, int);
 int put_tty_line(char *, int, int, int);
@@ -214,7 +208,6 @@ int read_file(char *, int);
 int read_stream(FILE *, int);
 int search_and_replace(pattern_t *, int, int);
 int set_active_node(line_t *);
-void set_des_key(char *);
 void seterrmsg(char *);
 void signal_hup(int);
 void signal_int(int);
diff --git a/bin/ed/io.c b/bin/ed/io.c
index cbf58d5d48d..3a2b37cf3e6 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: io.c,v 1.15 2009/10/28 15:40:47 deraadt Exp $	*/
+/*	$OpenBSD: io.c,v 1.16 2014/04/14 22:12:01 tedu Exp $	*/
 /*	$NetBSD: io.c,v 1.2 1995/03/21 09:04:43 cgd Exp $	*/
 
 /* io.c: This file contains the i/o routines for the ed line editor */
@@ -58,8 +58,6 @@ read_file(char *fn, int n)
 }
 
 
-extern int des;
-
 char *sbuf;			/* file i/o buffer */
 int sbufsz;			/* file i/o buffer size */
 int newline_added;		/* if set, newline appended to input file */
@@ -77,10 +75,6 @@ read_stream(FILE *fp, int n)
 	int len;
 
 	isbinary = newline_added = 0;
-#ifdef DES
-	if (des)
-		init_des_cipher();
-#endif
 	for (current_addr = n; (len = get_stream_line(fp)) > 0; size += len) {
 		SPL1();
 		if (put_sbuf_line(sbuf) == NULL) {
@@ -109,17 +103,9 @@ read_stream(FILE *fp, int n)
 		newline_added = 1;
 	newline_added = appended ? newline_added : o_newline_added;
 	isbinary = isbinary | o_isbinary;
-	if (des)
-		size += 8 - size % 8;			/* adjust DES size */
 	return size;
 }
 
-#ifdef DES
-#define DESGETCHAR(fp) (des ? get_des_char((fp)) : getc((fp)))
-#else
-#define DESGETCHAR(fp) (getc((fp)))
-#endif
-
 /* get_stream_line: read a line of text from a stream; return line length */
 int
 get_stream_line(FILE *fp)
@@ -127,7 +113,7 @@ get_stream_line(FILE *fp)
 	int c;
 	int i = 0;
 
-	while (((c = DESGETCHAR(fp)) != EOF || (!feof(fp) &&
+	while (((c = getc(fp)) != EOF || (!feof(fp) &&
 	    !ferror(fp))) && c != '\n') {
 		REALLOC(sbuf, sbufsz, i + 1, ERR);
 		if (!(sbuf[i++] = c))
@@ -182,10 +168,6 @@ write_stream(FILE *fp, int n, int m)
 	char *s;
 	int len;
 
-#ifdef DES
-	if (des)
-		init_des_cipher();
-#endif
 	for (; n && n <= m; n++, lp = lp->q_forw) {
 		if ((s = get_sbuf_line(lp)) == NULL)
 			return ERR;
@@ -196,28 +178,16 @@ write_stream(FILE *fp, int n, int m)
 			return ERR;
 		size += len;
 	}
-#ifdef DES
-	if (des) {
-		flush_des_file(fp);			/* flush buffer */
-		size += 8 - size % 8;			/* adjust DES size */
-	}
-#endif
 	return size;
 }
 
-#ifdef DES
-#define DESPUTCHAR(c, fp) (des ? put_des_char((c), (fp)) : fputc((c), (fp)))
-#else
-#define DESPUTCHAR(c, fp) (fputc((c), (fp)))
-#endif
-
 
 /* put_stream_line: write a line of text to a stream; return status */
 int
 put_stream_line(FILE *fp, char *s, int len)
 {
 	while (len--) {
-		if (DESPUTCHAR(*s, fp) < 0) {
+		if (fputc(*s, fp) < 0) {
 			perror(NULL);
 			seterrmsg("cannot write file");
 			return ERR;
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 5a75dbd20c2..2467d518e6e 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.36 2013/11/21 15:54:45 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.37 2014/04/14 22:12:01 tedu Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $	*/
 
 /* main.c: This file contains the main control and user-interface routines
@@ -39,10 +39,6 @@
  *	The buffering algorithm is attributed to Rodney Ruddock of
  *	the University of Guelph, Guelph, Ontario.
  *
- *	The cbc.c encryption code is adapted from
- *	the bdes program by Matt Bishop of Dartmouth College,
- *	Hanover, NH.
- *
  */
 
 #include <sys/ioctl.h>
@@ -72,7 +68,6 @@ int ibufsz;			/* ed command-line buffer size */
 char *ibufp;			/* pointer to ed command-line buffer */
 
 /* global flags */
-int des = 0;			/* if set, use crypt(3) for i/o */
 int garrulous = 0;		/* if set, print all error messages */
 int isbinary;			/* if set, buffer contains ASCII NULs */
 int isglobal;			/* if set, doing a global command */
@@ -123,13 +118,8 @@ top:
 			scripted = 1;
 			break;
 		case 'x':				/* use crypt */
-#ifdef DES
-			des = get_keyword();
-#else
 			fprintf(stderr, "crypt unavailable\n?\n");
-#endif
 			break;
-
 		default:
 			fprintf(stderr, usage, argv[0]);
 			exit(1);
@@ -859,13 +849,8 @@ exec_command(void)
 			return ERR;
 		}
 		GET_COMMAND_SUFFIX();
-#ifdef DES
-		des = get_keyword();
-#else
 		seterrmsg("crypt unavailable");
 		return ERR;
-#endif
-		break;
 	case 'z':
 		first_addr = 1;
 #ifdef BACKWARDS