diff options
author | dougb <dougb@FreeBSD.org> | 2009-05-26 00:07:02 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2009-05-26 00:07:02 +0000 |
commit | 8af28beff77874caf49b779147d1067f30127fd3 (patch) | |
tree | 329881bfdd1f255ed9a5815a625182414e879f4d /libexec | |
parent | fd325545078a40885d0b5da5679a77b887de379c (diff) | |
download | FreeBSD-src-8af28beff77874caf49b779147d1067f30127fd3.zip FreeBSD-src-8af28beff77874caf49b779147d1067f30127fd3.tar.gz |
Per the man page:
The makekey utility has been deprecated and will be removed in a future
release of FreeBSD.
Actually removing it was approved back on 10/29/2007 by re (kensmith) but
I dropped the ball on actually removing it. It's doubtful that it's become
more relevant/useful in the intervening time.
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/Makefile | 1 | ||||
-rw-r--r-- | libexec/makekey/Makefile | 10 | ||||
-rw-r--r-- | libexec/makekey/makekey.8 | 69 | ||||
-rw-r--r-- | libexec/makekey/makekey.c | 84 |
4 files changed, 0 insertions, 164 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 04fc38b..72ec913 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -11,7 +11,6 @@ SUBDIR= ${_atrun} \ getty \ lukemftpd \ ${_mail.local} \ - makekey \ ${_mknetid} \ ${_pppoed} \ rbootd \ diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile deleted file mode 100644 index d09f812..0000000 --- a/libexec/makekey/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD$ - -PROG= makekey -MAN= makekey.8 - -DPADD= ${LIBCRYPT} -LDADD= -lcrypt - -.include <bsd.prog.mk> diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8 deleted file mode 100644 index 7f7f054d..0000000 --- a/libexec/makekey/makekey.8 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright (c) 1990, 1991, 1993 -.\" The Regents of the University of California. 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. 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. -.\" -.\" @(#)makekey.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD$ -.\" -.Dd October 8, 2003 -.Dt MAKEKEY 8 -.Os -.Sh NAME -.Nm makekey -.Nd make encrypted keys or passwords -.Sh SYNOPSIS -.Nm -.Sh DESCRIPTION -.Bf Em -The -.Nm -utility has been deprecated and will be removed in a future release of -.Fx . -.Ef -.Pp -The -.Nm -utility encrypts a key and salt which it reads from the standard input -and writes the result to the standard output. -The key is expected to be -eight bytes; the salt is expected to be two bytes. -See -.Xr crypt 3 -for more information on what characters the key and salt can contain -and how the encrypted value is calculated. -.Sh SEE ALSO -.Xr login 1 , -.Xr openssl 1 , -.Xr crypt 3 -.Sh HISTORY -A -.Nm -utility appeared in -.At v7 . diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c deleted file mode 100644 index 2b541bf..0000000 --- a/libexec/makekey/makekey.c +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. 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. - */ - -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)makekey.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -#include <sys/types.h> - -#include <err.h> -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -static void get(char *, int); - -int -main(int argc __unused, char *argv[] __unused) -{ - int len; - char *r, key[9], salt[3]; - - get(key, sizeof(key) - 1); - get(salt, sizeof(salt) - 1); - len = strlen(r = crypt(key, salt)); - if (write(STDOUT_FILENO, r, len) != len) - err(1, "stdout"); - exit(0); -} - -static void -get(char *bp, int len) -{ - int nr; - - bp[len] = '\0'; - if ((nr = read(STDIN_FILENO, bp, len)) == len) - return; - if (nr >= 0) - errno = EFTYPE; - err(1, "stdin"); -} |