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, 235 insertions, 0 deletions

diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
new file mode 100644
index 0000000000..7f13bbbf62
--- /dev/null
+++ b/src/usr.bin/openssl/pkey.c
@@ -0,0 +1,235 @@
+/* $OpenBSD: pkey.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project 2006
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ *    licensing@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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "apps.h"
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+
+int pkey_main(int, char **);
+
+int
+pkey_main(int argc, char **argv)
+{
+        ENGINE *e = NULL;
+        char **args, *infile = NULL, *outfile = NULL;
+        char *passargin = NULL, *passargout = NULL;
+        BIO *in = NULL, *out = NULL;
+        const EVP_CIPHER *cipher = NULL;
+        int informat, outformat;
+        int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0;
+        EVP_PKEY *pkey = NULL;
+        char *passin = NULL, *passout = NULL;
+        int badarg = 0;
+#ifndef OPENSSL_NO_ENGINE
+        char *engine = NULL;
+#endif
+        int ret = 1;
+
+        informat = FORMAT_PEM;
+        outformat = FORMAT_PEM;
+
+        ERR_load_crypto_strings();
+        OpenSSL_add_all_algorithms();
+        args = argv + 1;
+        while (!badarg && *args && *args[0] == '-') {
+                if (!strcmp(*args, "-inform")) {
+                        if (args[1]) {
+                                args++;
+                                informat = str2fmt(*args);
+                        } else
+                                badarg = 1;
+                } else if (!strcmp(*args, "-outform")) {
+                        if (args[1]) {
+                                args++;
+                                outformat = str2fmt(*args);
+                        } else
+                                badarg = 1;
+                } else if (!strcmp(*args, "-passin")) {
+                        if (!args[1])
+                                goto bad;
+                        passargin = *(++args);
+                } else if (!strcmp(*args, "-passout")) {
+                        if (!args[1])
+                                goto bad;
+                        passargout = *(++args);
+                }
+#ifndef OPENSSL_NO_ENGINE
+                else if (strcmp(*args, "-engine") == 0) {
+                        if (!args[1])
+                                goto bad;
+                        engine = *(++args);
+                }
+#endif
+                else if (!strcmp(*args, "-in")) {
+                        if (args[1]) {
+                                args++;
+                                infile = *args;
+                        } else
+                                badarg = 1;
+                } else if (!strcmp(*args, "-out")) {
+                        if (args[1]) {
+                                args++;
+                                outfile = *args;
+                        } else
+                                badarg = 1;
+                } else if (strcmp(*args, "-pubin") == 0) {
+                        pubin = 1;
+                        pubout = 1;
+                        pubtext = 1;
+                } else if (strcmp(*args, "-pubout") == 0)
+                        pubout = 1;
+                else if (strcmp(*args, "-text_pub") == 0) {
+                        pubtext = 1;
+                        text = 1;
+                } else if (strcmp(*args, "-text") == 0)
+                        text = 1;
+                else if (strcmp(*args, "-noout") == 0)
+                        noout = 1;
+                else {
+                        cipher = EVP_get_cipherbyname(*args + 1);
+                        if (!cipher) {
+                                BIO_printf(bio_err, "Unknown cipher %s\n",
+                                    *args + 1);
+                                badarg = 1;
+                        }
+                }
+                args++;
+        }
+
+        if (badarg) {
+bad:
+                BIO_printf(bio_err, "Usage pkey [options]\n");
+                BIO_printf(bio_err, "where options are\n");
+                BIO_printf(bio_err, "-in file        input file\n");
+                BIO_printf(bio_err, "-inform X       input format (DER or PEM)\n");
+                BIO_printf(bio_err, "-passin arg     input file pass phrase source\n");
+                BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
+                BIO_printf(bio_err, "-out file       output file\n");
+                BIO_printf(bio_err, "-passout arg    output file pass phrase source\n");
+#ifndef OPENSSL_NO_ENGINE
+                BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+#endif
+                return 1;
+        }
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+        if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+                BIO_printf(bio_err, "Error getting passwords\n");
+                goto end;
+        }
+        if (outfile) {
+                if (!(out = BIO_new_file(outfile, "wb"))) {
+                        BIO_printf(bio_err,
+                            "Can't open output file %s\n", outfile);
+                        goto end;
+                }
+        } else {
+                out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        }
+
+        if (pubin)
+                pkey = load_pubkey(bio_err, infile, informat, 1,
+                    passin, e, "Public Key");
+        else
+                pkey = load_key(bio_err, infile, informat, 1,
+                    passin, e, "key");
+        if (!pkey)
+                goto end;
+
+        if (!noout) {
+                if (outformat == FORMAT_PEM) {
+                        if (pubout)
+                                PEM_write_bio_PUBKEY(out, pkey);
+                        else
+                                PEM_write_bio_PrivateKey(out, pkey, cipher,
+                                    NULL, 0, NULL, passout);
+                } else if (outformat == FORMAT_ASN1) {
+                        if (pubout)
+                                i2d_PUBKEY_bio(out, pkey);
+                        else
+                                i2d_PrivateKey_bio(out, pkey);
+                } else {
+                        BIO_printf(bio_err, "Bad format specified for key\n");
+                        goto end;
+                }
+
+        }
+        if (text) {
+                if (pubtext)
+                        EVP_PKEY_print_public(out, pkey, 0, NULL);
+                else
+                        EVP_PKEY_print_private(out, pkey, 0, NULL);
+        }
+        ret = 0;
+
+end:
+        EVP_PKEY_free(pkey);
+        BIO_free_all(out);
+        BIO_free(in);
+        free(passin);
+        free(passout);
+
+        return ret;
+}