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

diff --git a/src/usr.bin/openssl/ciphers.c b/src/usr.bin/openssl/ciphers.c
new file mode 100644
index 0000000000..bf17f71c06
--- /dev/null
+++ b/src/usr.bin/openssl/ciphers.c
@@ -0,0 +1,194 @@
+/* $OpenBSD: ciphers.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * 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 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 cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "apps.h"
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+
+static const char *ciphers_usage[] = {
+        "usage: ciphers args\n",
+        " -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
+        " -V          - even more verbose\n",
+        " -ssl3       - SSL3 mode\n",
+        " -tls1       - TLS1 mode\n",
+        NULL
+};
+
+int ciphers_main(int, char **);
+
+int
+ciphers_main(int argc, char **argv)
+{
+        int ret = 1, i;
+        int verbose = 0, Verbose = 0;
+        const char **pp;
+        const char *p;
+        int badops = 0;
+        SSL_CTX *ctx = NULL;
+        SSL *ssl = NULL;
+        char *ciphers = NULL;
+        const SSL_METHOD *meth = NULL;
+        STACK_OF(SSL_CIPHER) * sk;
+        BIO *STDout = NULL;
+        char *desc;
+
+        meth = SSLv3_server_method();
+
+        STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
+
+        argc--;
+        argv++;
+        while (argc >= 1) {
+                if (strcmp(*argv, "-v") == 0)
+                        verbose = 1;
+                else if (strcmp(*argv, "-V") == 0)
+                        verbose = Verbose = 1;
+                else if (strcmp(*argv, "-ssl3") == 0)
+                        meth = SSLv3_client_method();
+                else if (strcmp(*argv, "-tls1") == 0)
+                        meth = TLSv1_client_method();
+                else if ((strncmp(*argv, "-h", 2) == 0) ||
+                    (strcmp(*argv, "-?") == 0)) {
+                        badops = 1;
+                        break;
+                } else {
+                        ciphers = *argv;
+                }
+                argc--;
+                argv++;
+        }
+
+        if (badops) {
+                for (pp = ciphers_usage; (*pp != NULL); pp++)
+                        BIO_printf(bio_err, "%s", *pp);
+                goto end;
+        }
+
+        ctx = SSL_CTX_new(meth);
+        if (ctx == NULL)
+                goto err;
+        if (ciphers != NULL) {
+                if (!SSL_CTX_set_cipher_list(ctx, ciphers)) {
+                        BIO_printf(bio_err, "Error in cipher list\n");
+                        goto err;
+                }
+        }
+        ssl = SSL_new(ctx);
+        if (ssl == NULL)
+                goto err;
+
+        if (!verbose) {
+                for (i = 0; ; i++) {
+                        p = SSL_get_cipher_list(ssl, i);
+                        if (p == NULL)
+                                break;
+                        if (i != 0)
+                                BIO_printf(STDout, ":");
+                        BIO_printf(STDout, "%s", p);
+                }
+                BIO_printf(STDout, "\n");
+        } else {                /* verbose */
+                sk = SSL_get_ciphers(ssl);
+
+                for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+                        SSL_CIPHER *c;
+
+                        c = sk_SSL_CIPHER_value(sk, i);
+
+                        if (Verbose) {
+                                unsigned long id = SSL_CIPHER_get_id(c);
+                                int id0 = (int) (id >> 24);
+                                int id1 = (int) ((id >> 16) & 0xffL);
+                                int id2 = (int) ((id >> 8) & 0xffL);
+                                int id3 = (int) (id & 0xffL);
+
+                                if ((id & 0xff000000L) == 0x02000000L)
+                                        BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3);      /* SSL2 cipher */
+                                else if ((id & 0xff000000L) == 0x03000000L)
+                                        BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3);     /* SSL3 cipher */
+                                else
+                                        BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3);       /* whatever */
+                        }
+                        desc = SSL_CIPHER_description(c, NULL, 0);
+                        BIO_puts(STDout, desc);
+                        if (strcmp(desc, "OPENSSL_malloc Error") != 0)
+                                free(desc);
+                }
+        }
+
+        ret = 0;
+        if (0) {
+err:
+                ERR_print_errors(bio_err);
+        }
+
+end:
+        if (ctx != NULL)
+                SSL_CTX_free(ctx);
+        if (ssl != NULL)
+                SSL_free(ssl);
+        if (STDout != NULL)
+                BIO_free_all(STDout);
+
+        return (ret);
+}