Module Name: src
Committed By: riz
Date: Wed Jun 9 19:20:18 UTC 2010
Modified Files:
src/bin/ed: cbc.c
Log Message:
If the definition of a static function is #if DES, the declaration
of it should be too. Fixes build of ed where MKCRYPTO=no.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/bin/ed/cbc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ed/cbc.c
diff -u src/bin/ed/cbc.c:1.21 src/bin/ed/cbc.c:1.22
--- src/bin/ed/cbc.c:1.21 Sun Jul 26 02:07:12 2009
+++ src/bin/ed/cbc.c Wed Jun 9 19:20:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cbc.c,v 1.21 2009/07/26 02:07:12 dholland Exp $ */
+/* $NetBSD: cbc.c,v 1.22 2010/06/09 19:20:18 riz Exp $ */
/* cbc.c: This file contains the encryption routines for the ed line editor */
/*-
@@ -72,7 +72,7 @@
#if 0
static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
#else
-__RCSID("$NetBSD: cbc.c,v 1.21 2009/07/26 02:07:12 dholland Exp $");
+__RCSID("$NetBSD: cbc.c,v 1.22 2010/06/09 19:20:18 riz Exp $");
#endif
#endif /* not lint */
@@ -141,12 +141,14 @@
#endif
+#ifdef DES
static void des_error(const char *);
static int hex_to_binary(int, int);
static void expand_des_key(char *, char *);
static void set_des_key(char *);
static int cbc_decode(char *, FILE *);
static int cbc_encode(char *, int, FILE *);
+#endif
/* init_des_cipher: initialize DES */