7 files changed, 7 insertions, 98 deletions

diff --git a/src/lib/libcrypto/asn1/a_gentm.c b/src/lib/libcrypto/asn1/a_gentm.c
index c658b1ea35..bc3453f410 100644
--- a/src/lib/libcrypto/asn1/a_gentm.c
+++ b/src/lib/libcrypto/asn1/a_gentm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_gentm.c,v 1.22 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_gentm.c,v 1.23 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,43 +67,6 @@
 
 #include "o_time.h"
 
-#if 0
-
-int
-i2d_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME *a, unsigned char **pp)
-{
-        return(i2d_ASN1_bytes((ASN1_STRING *)a, pp,
-            V_ASN1_GENERALIZEDTIME, V_ASN1_UNIVERSAL));
-}
-
-
-ASN1_GENERALIZEDTIME *
-d2i_ASN1_GENERALIZEDTIME(ASN1_GENERALIZEDTIME **a, unsigned char **pp,
-    long length)
-{
-        ASN1_GENERALIZEDTIME *ret = NULL;
-
-        ret = (ASN1_GENERALIZEDTIME *)d2i_ASN1_bytes((ASN1_STRING **)a, pp, length,
-            V_ASN1_GENERALIZEDTIME, V_ASN1_UNIVERSAL);
-        if (ret == NULL) {
-                ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME, ERR_R_NESTED_ASN1_ERROR);
-                return (NULL);
-        }
-        if (!ASN1_GENERALIZEDTIME_check(ret)) {
-                ASN1err(ASN1_F_D2I_ASN1_GENERALIZEDTIME, ASN1_R_INVALID_TIME_FORMAT);
-                goto err;
-        }
-
-        return (ret);
-
-err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-                M_ASN1_GENERALIZEDTIME_free(ret);
-        return (NULL);
-}
-
-#endif
-
 int
 ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
 {
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c
index b592c0e18a..f60a70d94d 100644
--- a/src/lib/libcrypto/asn1/a_strex.c
+++ b/src/lib/libcrypto/asn1/a_strex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_strex.c,v 1.24 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_strex.c,v 1.25 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -84,20 +84,6 @@
 /* Three IO functions for sending data to memory, a BIO and
  * and a FILE pointer.
  */
-#if 0                           /* never used */
-static int
-send_mem_chars(void *arg, const void *buf, int len)
-{
-        unsigned char **out = arg;
-
-        if (!out)
-                return 1;
-        memcpy(*out, buf, len);
-        *out += len;
-        return 1;
-}
-#endif
-
 static int
 send_bio_chars(void *arg, const void *buf, int len)
 {
diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index 94e249960a..c5e882a4f6 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time.c,v 1.21 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_time.c,v 1.22 2015/02/07 13:19:15 doug Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -73,18 +73,6 @@ IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
 
 IMPLEMENT_ASN1_FUNCTIONS(ASN1_TIME)
 
-#if 0
-int
-i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
-{
-        if (a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME)
-                return(i2d_ASN1_bytes((ASN1_STRING *)a, pp,
-                    a->type, V_ASN1_UNIVERSAL));
-        ASN1err(ASN1_F_I2D_ASN1_TIME, ASN1_R_EXPECTING_A_TIME);
-        return -1;
-}
-#endif
-
 ASN1_TIME *
 ASN1_TIME_set(ASN1_TIME *s, time_t t)
 {
diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index 2b952abae6..46de52a050 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_lib.c,v 1.32 2014/07/11 14:49:12 miod Exp $ */
+/* $OpenBSD: asn1_lib.c,v 1.33 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -140,12 +140,6 @@ ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
         if (inf && !(ret & V_ASN1_CONSTRUCTED))
                 goto err;
 
-#if 0
-        fprintf(stderr, "p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n",
-            (int)p, *plength, omax, (int)*pp, (int)(p+ *plength),
-            (int)(omax+ *pp));
-
-#endif
         if (*plength > (omax - (p - *pp))) {
                 ASN1err(ASN1_F_ASN1_GET_OBJECT, ASN1_R_TOO_LONG);
                 /* Set this so that even if things are not long enough
diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index 2c8062bb8a..b5742fe97d 100644
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ b/src/lib/libcrypto/asn1/asn1_par.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_par.c,v 1.21 2014/10/03 06:02:38 doug Exp $ */
+/* $OpenBSD: asn1_par.c,v 1.22 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -126,11 +126,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
         /* ASN1_BMPSTRING *bmp=NULL;*/
         int dump_indent;
 
-#if 0
-        dump_indent = indent;
-#else
         dump_indent = 6;        /* Because we know BIO_dump_indent() */
-#endif
         p = *pp;
         tot = p + length;
         op = p - 1;
diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c
index f4872d8b24..1c83fc5608 100644
--- a/src/lib/libcrypto/asn1/t_x509.c
+++ b/src/lib/libcrypto/asn1/t_x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_x509.c,v 1.25 2014/07/12 16:33:25 miod Exp $ */
+/* $OpenBSD: t_x509.c,v 1.26 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -172,14 +172,6 @@ X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
         if (!(cflag & X509_FLAG_NO_SIGNAME)) {
                 if (X509_signature_print(bp, x->sig_alg, NULL) <= 0)
                         goto err;
-#if 0
-                if (BIO_printf(bp, "%8sSignature Algorithm: ", "") <= 0)
-                        goto err;
-                if (i2a_ASN1_OBJECT(bp, ci->signature->algorithm) <= 0)
-                        goto err;
-                if (BIO_puts(bp, "\n") <= 0)
-                        goto err;
-#endif
         }
 
         if (!(cflag & X509_FLAG_NO_ISSUER)) {
diff --git a/src/lib/libcrypto/asn1/tasn_prn.c b/src/lib/libcrypto/asn1/tasn_prn.c
index 9383750a82..844960fc77 100644
--- a/src/lib/libcrypto/asn1/tasn_prn.c
+++ b/src/lib/libcrypto/asn1/tasn_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_prn.c,v 1.11 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: tasn_prn.c,v 1.12 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -260,11 +260,6 @@ asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent, const ASN1_ITEM *it,
                 break;
 
         case ASN1_ITYPE_CHOICE:
-#if 0
-                if (!nohdr &&
-                    !asn1_print_fsname(out, indent, fname, sname, pctx))
-                        return 0;
-#endif
                 /* CHOICE type, get selector */
                 i = asn1_get_choice_selector(fld, it);
                 /* This should never happen... */
@@ -395,11 +390,6 @@ asn1_print_fsname(BIO *out, int indent, const char *fname, const char *sname,
         static char spaces[] = "                    ";
         const int nspaces = sizeof(spaces) - 1;
 
-#if 0
-        if (!sname && !fname)
-                return 1;
-#endif
-
         while (indent > nspaces) {
                 if (BIO_write(out, spaces, nspaces) != nspaces)
                         return 0;