4 files changed, 4 insertions, 92 deletions

diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c
index ec3b160b9f..fb985db27f 100644
--- a/src/lib/libcrypto/asn1/a_strnid.c
+++ b/src/lib/libcrypto/asn1/a_strnid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_strnid.c,v 1.14 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_strnid.c,v 1.15 2014/06/22 13:17:08 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -286,34 +286,3 @@ st_free(ASN1_STRING_TABLE *tbl)
 
 
 IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
-
-#ifdef STRING_TABLE_TEST
-
-main()
-{
-        ASN1_STRING_TABLE *tmp;
-        int i, last_nid = -1;
-
-        for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
-                if (tmp->nid < last_nid) {
-                        last_nid = 0;
-                        break;
-                }
-                last_nid = tmp->nid;
-        }
-
-        if (last_nid != 0) {
-                printf("Table order OK\n");
-                exit(0);
-        }
-
-        for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
-                printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,
-                    OBJ_nid2ln(tmp->nid));
-        }
-
-}
-
-#endif
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index d79ea6e5b1..72ed0c4ec3 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ameth_lib.c,v 1.8 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: ameth_lib.c,v 1.9 2014/06/22 13:17:08 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -99,19 +99,6 @@ typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
 DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)
 static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
 
-#ifdef TEST
-void
-main()
-{
-        int i;
-        for (i = 0;
-            i < sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *); i++)
-                fprintf(stderr, "Number %d id=%d (%s)\n", i,
-                    standard_methods[i]->pkey_id,
-                    OBJ_nid2sn(standard_methods[i]->pkey_id));
-}
-#endif
-
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
     const EVP_PKEY_ASN1_METHOD *, ameth);
 
diff --git a/src/lib/libssl/src/crypto/asn1/a_strnid.c b/src/lib/libssl/src/crypto/asn1/a_strnid.c
index ec3b160b9f..fb985db27f 100644
--- a/src/lib/libssl/src/crypto/asn1/a_strnid.c
+++ b/src/lib/libssl/src/crypto/asn1/a_strnid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_strnid.c,v 1.14 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_strnid.c,v 1.15 2014/06/22 13:17:08 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -286,34 +286,3 @@ st_free(ASN1_STRING_TABLE *tbl)
 
 
 IMPLEMENT_STACK_OF(ASN1_STRING_TABLE)
-
-#ifdef STRING_TABLE_TEST
-
-main()
-{
-        ASN1_STRING_TABLE *tmp;
-        int i, last_nid = -1;
-
-        for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
-                if (tmp->nid < last_nid) {
-                        last_nid = 0;
-                        break;
-                }
-                last_nid = tmp->nid;
-        }
-
-        if (last_nid != 0) {
-                printf("Table order OK\n");
-                exit(0);
-        }
-
-        for (tmp = tbl_standard, i = 0;
-            i < sizeof(tbl_standard) / sizeof(ASN1_STRING_TABLE); i++, tmp++) {
-                printf("Index %d, NID %d, Name=%s\n", i, tmp->nid,
-                    OBJ_nid2ln(tmp->nid));
-        }
-
-}
-
-#endif
diff --git a/src/lib/libssl/src/crypto/asn1/ameth_lib.c b/src/lib/libssl/src/crypto/asn1/ameth_lib.c
index d79ea6e5b1..72ed0c4ec3 100644
--- a/src/lib/libssl/src/crypto/asn1/ameth_lib.c
+++ b/src/lib/libssl/src/crypto/asn1/ameth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ameth_lib.c,v 1.8 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: ameth_lib.c,v 1.9 2014/06/22 13:17:08 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -99,19 +99,6 @@ typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
 DECLARE_STACK_OF(EVP_PKEY_ASN1_METHOD)
 static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
 
-#ifdef TEST
-void
-main()
-{
-        int i;
-        for (i = 0;
-            i < sizeof(standard_methods) / sizeof(EVP_PKEY_ASN1_METHOD *); i++)
-                fprintf(stderr, "Number %d id=%d (%s)\n", i,
-                    standard_methods[i]->pkey_id,
-                    OBJ_nid2sn(standard_methods[i]->pkey_id));
-}
-#endif
-
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
     const EVP_PKEY_ASN1_METHOD *, ameth);