From adfe54b7beb931fa0a717fc2831bada8b4f4fa16 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Thu, 8 Mar 2001 11:59:48 +0000
Subject: [PATCH] Integrate ectest.c (which does not yet do anything).

---
 crypto/ec/ectest.c | 25 +++++++++++++++++++++++++
 test/Makefile.ssl  | 15 +++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 29cbe2617d..f557480f44 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -54,4 +54,29 @@
  *
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <openssl/ec.h>
+#include <openssl/err.h>
+
+
+#define ABORT do { \
+	fprintf(stderr, "%s:%d: Error\n", __FILE__, __LINE__); \
+	ERR_print_errors_fp(stderr); \
+	exit(1); \
+} while (0)
+
+int main(int argc, char *argv[])
+	{	
+	EC_GROUP *group;
+
+	ERR_load_crypto_strings();
+
+#if 0
+	group = EC_GROUP_new(NULL);
+	if (!group) ABORT;
+#endif
+
+	return 0;
+	}
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 98d7b7c4ac..00426755fa 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -32,6 +32,7 @@ LIBCRYPTO= -L.. -lcrypto
 LIBSSL= -L.. -lssl
 
 BNTEST=		bntest
+ECTEST=		ectest
 EXPTEST=	exptest
 IDEATEST=	ideatest
 SHATEST=	shatest
@@ -58,7 +59,7 @@ ENGINETEST=	enginetest
 
 TESTS=		alltests
 
-EXE=	$(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD4TEST) $(MD5TEST) $(HMACTEST) \
+EXE=	$(BNTEST) $(ECTEST) $(IDEATEST) $(MD2TEST)  $(MD4TEST) $(MD5TEST) $(HMACTEST) \
 	$(RC2TEST) $(RC4TEST) $(RC5TEST) \
 	$(DESTEST) $(SHATEST) $(SHA1TEST) $(MDC2TEST) $(RMDTEST) \
 	$(RANDTEST) $(DHTEST) $(ENGINETEST) \
@@ -66,13 +67,13 @@ EXE=	$(BNTEST) $(IDEATEST) $(MD2TEST)  $(MD4TEST) $(MD5TEST) $(HMACTEST) \
 
 # $(METHTEST)
 
-OBJ=	$(BNTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
+OBJ=	$(BNTEST).o $(ECTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
 	$(HMACTEST).o \
 	$(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
 	$(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
 	$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
 	$(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o
-SRC=	$(BNTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
+SRC=	$(BNTEST).c $(ECTEST).c $(IDEATEST).c $(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
 	$(HMACTEST).c \
 	$(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
 	$(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
@@ -113,7 +114,7 @@ alltests: \
 	test_des test_idea test_sha test_md4 test_md5 test_hmac \
 	test_md2 test_mdc2 \
 	test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_rd \
-	test_rand test_bn test_enc test_x509 test_rsa test_crl test_sid \
+	test_rand test_bn test_ec test_enc test_x509 test_rsa test_crl test_sid \
 	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
 	test_ss test_ca test_engine test_ssl
 
@@ -201,6 +202,9 @@ test_bn:
 	@echo 'test a^b%c implementations'
 	./$(EXPTEST)
 
+test_ec:
+	./$(ECTEST)
+
 test_verify:
 	@echo "The following command should have some OK's and some failures"
 	@echo "There are definitly a few expired certificates"
@@ -268,6 +272,9 @@ $(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
 $(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
 	$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
 
+$(ECTEST): $(ECTEST).o $(DLIBCRYPTO)
+	$(CC) -o $(ECTEST) $(CFLAGS) $(ECTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
 $(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
 	$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
 
-- 
2.34.1