Move openssl(1) from /usr/sbin/openssl to /usr/bin/openssl, since it is not

a system/superuser binary. At the same time, move the source code from its
current lib/libssl/src/apps location to a more appropriate home under
usr.bin/openssl.

ok deraadt@ miod@

1 files changed, 147 insertions, 0 deletions

diff --git a/usr.bin/openssl/prime.c b/usr.bin/openssl/prime.c
new file mode 100644
index 00000000000..e7fb3257d8f
--- /dev/null
+++ b/usr.bin/openssl/prime.c
@@ -0,0 +1,147 @@
+/* $OpenBSD: prime.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  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 acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED 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 OpenSSL PROJECT OR
+ * ITS 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.
+ *
+ */
+
+#include <string.h>
+#include <limits.h>
+
+#include "apps.h"
+
+#include <openssl/bn.h>
+
+int prime_main(int, char **);
+
+int
+prime_main(int argc, char **argv)
+{
+	int hex = 0;
+	int checks = 20;
+	int generate = 0;
+	int bits = 0;
+	int safe = 0;
+	BIGNUM *bn = NULL;
+	const char *errstr = NULL;
+	BIO *bio_out;
+
+	--argc;
+	++argv;
+	while (argc >= 1 && **argv == '-') {
+		if (!strcmp(*argv, "-hex"))
+			hex = 1;
+		else if (!strcmp(*argv, "-generate"))
+			generate = 1;
+		else if (!strcmp(*argv, "-bits")) {
+			if (--argc < 1)
+				goto bad;
+			else
+				bits = strtonum(*(++argv), 0, INT_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else if (!strcmp(*argv, "-safe"))
+			safe = 1;
+		else if (!strcmp(*argv, "-checks")) {
+			if (--argc < 1)
+				goto bad;
+			else
+				checks = strtonum(*(++argv), 0, INT_MAX, &errstr);
+			if (errstr)
+				goto bad;
+		} else {
+			BIO_printf(bio_err, "Unknown option '%s'\n", *argv);
+			goto bad;
+		}
+		--argc;
+		++argv;
+	}
+
+	if (argv[0] == NULL && !generate) {
+		BIO_printf(bio_err, "No prime specified\n");
+		goto bad;
+	}
+	if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
+		BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
+	}
+	if (generate) {
+		char *s;
+
+		if (!bits) {
+			BIO_printf(bio_err, "Specifiy the number of bits.\n");
+			return 1;
+		}
+		bn = BN_new();
+		BN_generate_prime_ex(bn, bits, safe, NULL, NULL, NULL);
+		s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
+		BIO_printf(bio_out, "%s\n", s);
+		free(s);
+	} else {
+		if (hex)
+			BN_hex2bn(&bn, argv[0]);
+		else
+			BN_dec2bn(&bn, argv[0]);
+
+		BN_print(bio_out, bn);
+		BIO_printf(bio_out, " is %sprime\n",
+		    BN_is_prime_ex(bn, checks, NULL, NULL) ? "" : "not ");
+	}
+
+	BN_free(bn);
+	BIO_free_all(bio_out);
+
+	return 0;
+
+bad:
+	if (errstr)
+		BIO_printf(bio_err, "invalid argument %s: %s\n", *argv, errstr);
+	else {
+		BIO_printf(bio_err, "options are\n");
+		BIO_printf(bio_err, "%-14s hex\n", "-hex");
+		BIO_printf(bio_err, "%-14s number of checks\n", "-checks <n>");
+	}
+	return 1;
+}