From acc9efcd81c21f083ddd54c813e692ffd635cc6a Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 7 Jun 2014 15:06:24 +0000
Subject: Remove various test stubs.  The good ones have been moved by jsing
 and others to the regress framework.  These remaining ones just muddle us up
 when re-reading code repeatedly. ok jsing

---
 src/lib/libcrypto/evp/evp_pbe.c  | 24 ------------------------
 src/lib/libcrypto/evp/p5_crpt2.c | 11 -----------
 2 files changed, 35 deletions(-)

(limited to 'src/lib/libcrypto/evp')

diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c
index 779c1592da..dc8b5f51fc 100644
--- a/src/lib/libcrypto/evp/evp_pbe.c
+++ b/src/lib/libcrypto/evp/evp_pbe.c
@@ -111,30 +111,6 @@ static const EVP_PBE_CTL builtin_pbe[] = {
 	{EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0},
 };
 
-#ifdef TEST
-int
-main(int argc, char **argv)
-{
-	int i, nid_md, nid_cipher;
-	EVP_PBE_CTL *tpbe, *tpbe2;
-	/*OpenSSL_add_all_algorithms();*/
-
-	for (i = 0; i < sizeof(builtin_pbe) / sizeof(EVP_PBE_CTL); i++) {
-		tpbe = builtin_pbe + i;
-		fprintf(stderr, "%d %d %s ", tpbe->pbe_type, tpbe->pbe_nid,
-		    OBJ_nid2sn(tpbe->pbe_nid));
-		if (EVP_PBE_find(tpbe->pbe_type, tpbe->pbe_nid,
-		    &nid_cipher , &nid_md, 0))
-			fprintf(stderr, "Found %s %s\n",
-			    OBJ_nid2sn(nid_cipher), OBJ_nid2sn(nid_md));
-		else
-			fprintf(stderr, "Find ERROR!!\n");
-	}
-
-	return 0;
-}
-#endif
-
 int
 EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
     ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de)
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index c276cd28b8..ca68ac0d94 100644
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ b/src/lib/libcrypto/evp/p5_crpt2.c
@@ -166,17 +166,6 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt,
 	    EVP_sha1(), keylen, out);
 }
 
-#ifdef DO_TEST
-main()
-{
-	unsigned char out[4];
-	unsigned char salt[] = {0x12, 0x34, 0x56, 0x78};
-	PKCS5_PBKDF2_HMAC_SHA1("password", -1, salt, 4, 5, 4, out);
-	fprintf(stderr, "Out %02X %02X %02X %02X\n",
-	    out[0], out[1], out[2], out[3]);
-}
-#endif
-
 /* Now the key derivation function itself. This is a bit evil because
  * it has to check the ASN1 parameters are valid: and there are quite a
  * few of them...
-- 
cgit v1.2.3-55-g6feb