From b87e2576b51ab5e33a6a97b8d7206b9a39a90c3f Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 15 Nov 2002 22:54:13 +0000
Subject: [PATCH 01/37] Mention ActiveState Perl much earlier in INSTALL.WCE.

---
 INSTALL.WCE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL.WCE b/INSTALL.WCE
index 7de7faaa1d898..0690fa2b23d28 100644
--- a/INSTALL.WCE
+++ b/INSTALL.WCE
@@ -8,6 +8,9 @@
   * wcecompat compatibility library (www.essemer.com.au)
   * Optionally ceutils for running automated tests (www.essemer.com.au)
 
+ You also need Perl for Win32.  You will need ActiveState Perl, available
+ from http://www.activestate.com/ActivePerl.
+
  The C Runtime Library implementation for Windows CE that is included with
  Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
  incorrect.  wcecompat plugs the holes and tries to bring the Windows CE
@@ -20,9 +23,6 @@
  Building
  --------
 
- You need Perl for Win32.  Unless you will build on Cygwin, you will need
- ActiveState Perl, available from http://www.activestate.com/ActivePerl.
-
  Setup the eMbedded Visual C++ environment.  There are batch files for doing
  this installed with eVC++.  For an ARM processor, for example, execute:
 

From 89618e7a0d15e946fe98cede434f3becccd31ec2 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sat, 16 Nov 2002 09:42:04 +0000
Subject: [PATCH 02/37] We don't want TARGETCPU expanded here.

---
 util/pl/VC-CE.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/pl/VC-CE.pl b/util/pl/VC-CE.pl
index b2e328035cbba..e17896970f280 100644
--- a/util/pl/VC-CE.pl
+++ b/util/pl/VC-CE.pl
@@ -13,7 +13,7 @@
 # C compiler stuff
 $cc='$(CC)';
 $cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -D$(TARGETCPU) -D_$(TARGETCPU)_ -DUNDER_CE=300 -D_WIN32_CE=300 -DWIN32_PLATFORM_PSPC -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
-$lflags="/nologo /subsystem:windowsce,3.00 /machine:$(TARGETCPU) /opt:ref";
+$lflags='/nologo /subsystem:windowsce,3.00 /machine:$(TARGETCPU) /opt:ref';
 $mlflags='';
 
 $out_def="out32";

From b4b82ab4652f4eedf5146a92cd186d1f3bdb10e0 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sat, 16 Nov 2002 10:10:39 +0000
Subject: [PATCH 03/37] I forgot this is compiled in test/, not crypto/ec/...

---
 crypto/ec/ectest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index f3866481be81d..a396dd8f028ff 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -74,7 +74,7 @@
 #ifdef FLAT_INC
 #include "e_os.h"
 #else
-#include "../../e_os.h"
+#include "../e_os.h"
 #endif
 #include <string.h>
 #include <time.h>

From 95189389b0a53bc56e028230bfa0f0b8b89105a2 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 17 Nov 2002 08:03:24 +0000
Subject: [PATCH 04/37] Add the file openssl.pc that I forgot a while ago.

---
 openssl.pc | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 openssl.pc

diff --git a/openssl.pc b/openssl.pc
new file mode 100644
index 0000000000000..63ca8683913e2
--- /dev/null
+++ b/openssl.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local/ssl
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: OpenSSL
+Description: Secure Sockets Layer and cryptography libraries and tools
+Version: 0.9.8-dev
+Requires: 
+Libs: -L${libdir} -lssl -lcrypto -ldl
+Cflags: -I${includedir}

From 7f66ab4783f4b37fe5b55c68cf9f063fb5e1af90 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 17 Nov 2002 08:05:38 +0000
Subject: [PATCH 05/37] Adding openssl.pc to the repository was a mistake,
 since it's generated.

---
 openssl.pc | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 openssl.pc

diff --git a/openssl.pc b/openssl.pc
deleted file mode 100644
index 63ca8683913e2..0000000000000
--- a/openssl.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr/local/ssl
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: OpenSSL
-Description: Secure Sockets Layer and cryptography libraries and tools
-Version: 0.9.8-dev
-Requires: 
-Libs: -L${libdir} -lssl -lcrypto -ldl
-Cflags: -I${includedir}

From 7fa2a81d34254b41c313a33743ea30f710d94f44 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 17 Nov 2002 08:07:08 +0000
Subject: [PATCH 06/37] Ignore openssl.pc.  This way, there's no risk that I'll
 add it again :-).

---
 .cvsignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cvsignore b/.cvsignore
index 8ff9fdc9152bd..a01eb8619676d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
+openssl.pc
 Makefile.ssl
 MINFO
 makefile.one

From 629b58b7fbec9baee3de28605a7fbd0ab5555920 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 17 Nov 2002 19:48:19 +0000
Subject: [PATCH 07/37] Make it possible to build for more than one CPU.
 Clarify what the CE tests do.

---
 INSTALL.WCE      | 5 +++++
 util/pl/VC-CE.pl | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/INSTALL.WCE b/INSTALL.WCE
index 0690fa2b23d28..a22370bf0f90f 100644
--- a/INSTALL.WCE
+++ b/INSTALL.WCE
@@ -61,3 +61,8 @@
  > cd out32
  > ..\ms\testce
 
+ This will copy each of the test programs to the Windows CE device and execute
+ them, displaying the output of the tests on this computer.  The output should
+ look similar to the output produced by running the tests for a regular Windows
+ build.
+
diff --git a/util/pl/VC-CE.pl b/util/pl/VC-CE.pl
index e17896970f280..907495efe43bd 100644
--- a/util/pl/VC-CE.pl
+++ b/util/pl/VC-CE.pl
@@ -16,8 +16,8 @@
 $lflags='/nologo /subsystem:windowsce,3.00 /machine:$(TARGETCPU) /opt:ref';
 $mlflags='';
 
-$out_def="out32";
-$tmp_def="tmp32";
+$out_def='out32_$(TARGETCPU)';
+$tmp_def='tmp32_$(TARGETCPU)';
 $inc_def="inc32";
 
 if ($debug)
@@ -63,8 +63,8 @@
 	$mlflags.=" $lflags /dll";
 #	$cflags =~ s| /MD| /MT|;
 	$lib_cflag=" -D_WINDLL -D_DLL";
-	$out_def="out32dll";
-	$tmp_def="tmp32dll";
+	$out_def='out32dll_$(TARGETCPU)';
+	$tmp_def='tmp32dll_$(TARGETCPU)';
 	}
 
 $cflags.=" /Fd$out_def";

From 32d21c1ef6806f0f83f1162cbe9664fa7fd1d963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lutz=20J=C3=A4nicke?= <jaenicke@openssl.org>
Date: Mon, 18 Nov 2002 08:15:45 +0000
Subject: [PATCH 08/37] Better workaround to the "=head1 NAME OPTIONS"
 pod2latex problem: NAME OPTIONS are a subset of OPTIONS, so just make it
 =head2! Submitted by: Reviewed by: PR: 333

---
 doc/apps/x509.pod | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod
index 029777b88acd0..674bfd17cdeb0 100644
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -61,8 +61,9 @@ certificate trust settings.
 Since there are a large number of options they will split up into
 various sections.
 
+=head1 OPTIONS
 
-=head1 INPUT, OUTPUT AND GENERAL PURPOSE OPTIONS
+=head2 INPUT, OUTPUT AND GENERAL PURPOSE OPTIONS
 
 =over 4
 
@@ -100,7 +101,7 @@ this option has no effect: SHA1 is always used with DSA keys.
 
 =back
 
-=head1 DISPLAY OPTIONS
+=head2 DISPLAY OPTIONS
 
 Note: the B<-alias> and B<-purpose> options are also display options
 but are described in the B<TRUST SETTINGS> section.
@@ -152,7 +153,7 @@ outputs the issuer name.
 option which determines how the subject or issuer names are displayed. The
 B<option> argument can be a single option or multiple options separated by
 commas.  Alternatively the B<-nameopt> switch may be used more than once to
-set multiple options. See the B<SUBJECT AND ISSUER NAME OPTIONS> section for more information.
+set multiple options. See the B<NAME OPTIONS> section for more information.
 
 =item B<-email>
 
@@ -181,7 +182,7 @@ this outputs the certificate in the form of a C source file.
 
 =back
 
-=head1 TRUST SETTINGS
+=head2 TRUST SETTINGS
 
 Please note these options are currently experimental and may well change.
 
@@ -252,7 +253,7 @@ EXTENSIONS> section.
 
 =back
 
-=head1 SIGNING OPTIONS
+=head2 SIGNING OPTIONS
 
 The B<x509> utility can be used to sign certificates and requests: it
 can thus behave like a "mini CA".
@@ -362,7 +363,7 @@ specified then the extensions should either be contained in the unnamed
 
 =back
 
-=head1 SUBJECT AND ISSUER NAME OPTIONS
+=head2 NAME OPTIONS
 
 The B<nameopt> command line switch determines how the subject and issuer
 names are displayed. If no B<nameopt> switch is present the default "oneline"
@@ -499,7 +500,7 @@ name.
 
 =back
 
-=head1 TEXT OPTIONS
+=head2 TEXT OPTIONS
 
 As well as customising the name output format, it is also possible to
 customise the actual fields printed using the B<certopt> options when

From 527497a7224644ab3dfb11a7ee6c3baf570092e6 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 13:04:08 +0000
Subject: [PATCH 09/37] A variable of type time_t is supposed to be a time
 measurement starting at Epoch.  offset isn't such a measurement, so let's
 stop pretend it is.

---
 crypto/x509/x509_vfy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index db12f7bd35eb0..552d1e72516ea 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -756,7 +756,7 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time)
 	{
 	char *str;
 	ASN1_TIME atm;
-	time_t offset;
+	long offset;
 	char buff1[24],buff2[24],*p;
 	int i,j;
 

From 055076cd4f53849996d90cce60f5ab681b1ba0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 18 Nov 2002 13:37:40 +0000
Subject: [PATCH 10/37] allocate bio_err before memory debugging is enabled to
 avoid memory leaks (we can't release it before the CRYPTO_mem_leaks() call!)

Submitted by: Nils Larsch
---
 apps/openssl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 895d8f76b24f5..45f8d7f4ef2b1 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -229,6 +229,10 @@ int main(int Argc, char *Argv[])
 	arg.data=NULL;
 	arg.count=0;
 
+	if (bio_err == NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
 	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
 		{
 		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
@@ -253,10 +257,6 @@ int main(int Argc, char *Argv[])
 
 	apps_startup();
 
-	if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-
 	/* Lets load up our environment a little */
 	p=getenv("OPENSSL_CONF");
 	if (p == NULL)

From 9dc610495cb70d9e9566a188853860c542221d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 18 Nov 2002 14:00:42 +0000
Subject: [PATCH 11/37] fix memory leak in memory debuggin code ...

Submitted by: Nils Larsch
---
 crypto/mem_dbg.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 0c1855afb1420..57bd08f65d92c 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -102,6 +102,8 @@ typedef struct app_mem_info_st
 	int references;
 	} APP_INFO;
 
+static void app_info_free(APP_INFO *);
+
 static LHASH *amih=NULL; /* hash-table with those app_mem_info_st's
                           * that are at the top of their thread's stack
                           * (with `thread' as key);
@@ -140,6 +142,18 @@ static unsigned long disabling_thread = 0; /* Valid iff num_disable > 0.
                                             * thread named in disabling_thread).
                                             */
 
+static void app_info_free(APP_INFO *inf)
+	{
+	if (--(inf->references) <= 0)
+		{
+		if (inf->next != NULL)
+			{
+			app_info_free(inf->next);
+			}
+		OPENSSL_free(inf);
+		}
+	}
+
 int CRYPTO_mem_ctrl(int mode)
 	{
 	int ret=mh_mode;
@@ -502,9 +516,7 @@ void CRYPTO_dbg_free(void *addr, int before_p)
 				mp->order, mp->addr, mp->num);
 #endif
 				if (mp->app_info != NULL)
-					{
-					mp->app_info->references--;
-					}
+					app_info_free(mp->app_info);
 				OPENSSL_free(mp);
 				}
 

From 46633554961a5950410ef5690093b56f1f06e752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 18 Nov 2002 14:33:39 +0000
Subject: [PATCH 12/37] use consistent order of function definitions

---
 crypto/ec/ecp_mont.c | 120 +++++++++++++++++++++----------------------
 crypto/ec/ecp_nist.c |  39 +++++++-------
 2 files changed, 79 insertions(+), 80 deletions(-)

diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 900228d8af303..36f82368648aa 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -122,66 +122,6 @@ int ec_GFp_mont_group_init(EC_GROUP *group)
 	}
 
 
-int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
-	{
-	BN_CTX *new_ctx = NULL;
-	BN_MONT_CTX *mont = NULL;
-	BIGNUM *one = NULL;
-	int ret = 0;
-
-	if (group->field_data1 != NULL)
-		{
-		BN_MONT_CTX_free(group->field_data1);
-		group->field_data1 = NULL;
-		}
-	if (group->field_data2 != NULL)
-		{
-		BN_free(group->field_data2);
-		group->field_data2 = NULL;
-		}
-	
-	if (ctx == NULL)
-		{
-		ctx = new_ctx = BN_CTX_new();
-		if (ctx == NULL)
-			return 0;
-		}
-
-	mont = BN_MONT_CTX_new();
-	if (mont == NULL) goto err;
-	if (!BN_MONT_CTX_set(mont, p, ctx))
-		{
-		ECerr(EC_F_GFP_MONT_GROUP_SET_CURVE, ERR_R_BN_LIB);
-		goto err;
-		}
-	one = BN_new();
-	if (one == NULL) goto err;
-	if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err;
-
-	group->field_data1 = mont;
-	mont = NULL;
-	group->field_data2 = one;
-	one = NULL;
-
-	ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
-
-	if (!ret)
-		{
-		BN_MONT_CTX_free(group->field_data1);
-		group->field_data1 = NULL;
-		BN_free(group->field_data2);
-		group->field_data2 = NULL;
-		}
-
- err:
-	if (new_ctx != NULL)
-		BN_CTX_free(new_ctx);
-	if (mont != NULL)
-		BN_MONT_CTX_free(mont);
-	return ret;
-	}
-
-
 void ec_GFp_mont_group_finish(EC_GROUP *group)
 	{
 	if (group->field_data1 != NULL)
@@ -253,6 +193,66 @@ int ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 	}
 
 
+int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+	{
+	BN_CTX *new_ctx = NULL;
+	BN_MONT_CTX *mont = NULL;
+	BIGNUM *one = NULL;
+	int ret = 0;
+
+	if (group->field_data1 != NULL)
+		{
+		BN_MONT_CTX_free(group->field_data1);
+		group->field_data1 = NULL;
+		}
+	if (group->field_data2 != NULL)
+		{
+		BN_free(group->field_data2);
+		group->field_data2 = NULL;
+		}
+	
+	if (ctx == NULL)
+		{
+		ctx = new_ctx = BN_CTX_new();
+		if (ctx == NULL)
+			return 0;
+		}
+
+	mont = BN_MONT_CTX_new();
+	if (mont == NULL) goto err;
+	if (!BN_MONT_CTX_set(mont, p, ctx))
+		{
+		ECerr(EC_F_GFP_MONT_GROUP_SET_CURVE, ERR_R_BN_LIB);
+		goto err;
+		}
+	one = BN_new();
+	if (one == NULL) goto err;
+	if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) goto err;
+
+	group->field_data1 = mont;
+	mont = NULL;
+	group->field_data2 = one;
+	one = NULL;
+
+	ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
+
+	if (!ret)
+		{
+		BN_MONT_CTX_free(group->field_data1);
+		group->field_data1 = NULL;
+		BN_free(group->field_data2);
+		group->field_data2 = NULL;
+		}
+
+ err:
+	if (new_ctx != NULL)
+		BN_CTX_free(new_ctx);
+	if (mont != NULL)
+		BN_MONT_CTX_free(mont);
+	return ret;
+	}
+
+
 int ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 	{
 	if (group->field_data1 == NULL)
diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 0b39bb6166535..a6634f9bff645 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -128,7 +128,6 @@ void ec_GFp_nist_group_finish(EC_GROUP *group)
 	BN_free(&group->b);
 	}
 
-
 void ec_GFp_nist_group_clear_finish(EC_GROUP *group)
 	{
 	BN_clear_free(&group->field);
@@ -136,6 +135,25 @@ void ec_GFp_nist_group_clear_finish(EC_GROUP *group)
 	BN_clear_free(&group->b);
 	}
 
+int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
+	{
+	if (dest == NULL || src == NULL)
+		return 0;
+
+	if (!BN_copy(&dest->field, &src->field))
+		return 0;
+	if (!BN_copy(&dest->a, &src->a))
+		return 0;
+	if (!BN_copy(&dest->b, &src->b))
+		return 0;
+
+	dest->curve_name  = src->curve_name;
+
+	dest->a_is_minus3 = src->a_is_minus3;
+
+	return 1;
+	}
+
 
 int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 	const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
@@ -211,25 +229,6 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 	return ret;
 	}
 
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-	{
-	if (dest == NULL || src == NULL)
-		return 0;
-
-	if (!BN_copy(&dest->field, &src->field))
-		return 0;
-	if (!BN_copy(&dest->a, &src->a))
-		return 0;
-	if (!BN_copy(&dest->b, &src->b))
-		return 0;
-
-	dest->curve_name  = src->curve_name;
-
-	dest->a_is_minus3 = src->a_is_minus3;
-
-	return 1;
-	}
-
 int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
 	const BIGNUM *b, BN_CTX *ctx)
 	{

From a2dbcf3644b0e2cd9baeed6c629bbbdfb97ca7d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 18 Nov 2002 14:37:35 +0000
Subject: [PATCH 13/37] remove redundant functions

---
 crypto/ec/ec_lcl.h   |  4 ----
 crypto/ec/ecp_nist.c | 51 ++++++--------------------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index e84904b23b627..43649e96ada87 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -317,11 +317,7 @@ int ec_GFp_recp_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *
 
 
 /* method functions in ecp_nist.c */
-int ec_GFp_nist_group_init(EC_GROUP *);
 int ec_GFp_nist_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
-void ec_GFp_nist_group_finish(EC_GROUP *);
-void ec_GFp_nist_group_clear_finish(EC_GROUP *);
-int ec_GFp_nist_group_copy(EC_GROUP *, const EC_GROUP *);
 int ec_GFp_nist_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 int ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
 
diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index a6634f9bff645..559cb5c4188b5 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -69,10 +69,10 @@ const EC_METHOD *EC_GFp_nist_method(void)
 	{
 	static const EC_METHOD ret = {
 		NID_X9_62_prime_field,
-		ec_GFp_nist_group_init,
-		ec_GFp_nist_group_finish,
-		ec_GFp_nist_group_clear_finish,
-		ec_GFp_nist_group_copy,
+		ec_GFp_simple_group_init,
+		ec_GFp_simple_group_finish,
+		ec_GFp_simple_group_clear_finish,
+		ec_GFp_simple_group_copy,
 		ec_GFp_nist_group_set_curve,
 		ec_GFp_simple_group_get_curve,
 		ec_GFp_simple_group_get_degree,
@@ -113,47 +113,6 @@ const EC_METHOD *EC_GFp_nist_method(void)
 #define	NO_32_BIT_TYPE
 #endif
 
-int ec_GFp_nist_group_init(EC_GROUP *group)
-	{
-	int ok;
-
-	ok = ec_GFp_simple_group_init(group);
-	return ok;
-	}
-
-void ec_GFp_nist_group_finish(EC_GROUP *group)
-	{
-	BN_free(&group->field);
-	BN_free(&group->a);
-	BN_free(&group->b);
-	}
-
-void ec_GFp_nist_group_clear_finish(EC_GROUP *group)
-	{
-	BN_clear_free(&group->field);
-	BN_clear_free(&group->a);
-	BN_clear_free(&group->b);
-	}
-
-int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
-	{
-	if (dest == NULL || src == NULL)
-		return 0;
-
-	if (!BN_copy(&dest->field, &src->field))
-		return 0;
-	if (!BN_copy(&dest->a, &src->a))
-		return 0;
-	if (!BN_copy(&dest->b, &src->b))
-		return 0;
-
-	dest->curve_name  = src->curve_name;
-
-	dest->a_is_minus3 = src->a_is_minus3;
-
-	return 1;
-	}
-
 
 int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 	const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
@@ -229,6 +188,7 @@ int ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 	return ret;
 	}
 
+
 int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
 	const BIGNUM *b, BN_CTX *ctx)
 	{
@@ -254,6 +214,7 @@ int ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
 	return ret;
 	}
 
+
 int ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
 	BN_CTX *ctx)
 	{

From 450cee5c3a42337cb61387365a480228cee52967 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 23:05:39 +0000
Subject: [PATCH 14/37] Make sure sysconf exists (it doesn't in the VMS C RTL
 lesser than version 7).

---
 apps/speed.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/speed.c b/apps/speed.c
index 1d83adccfab68..27f2e675cdb9c 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -208,7 +208,8 @@
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
-# ifdef _SC_CLK_TCK
+# if defined(_SC_CLK_TCK) \
+     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
 #  define HZ ((double)sysconf(_SC_CLK_TCK))
 # else
 #  ifndef CLK_TCK

From a1d85309ee183c97a5ee4f8277f17d87d7786e25 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 23:06:36 +0000
Subject: [PATCH 15/37] Determine HZ exactly as in apps/speed.c.

---
 crypto/tmdiff.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c
index e1a0e17ac0588..307523ebba3b9 100644
--- a/crypto/tmdiff.c
+++ b/crypto/tmdiff.c
@@ -59,6 +59,9 @@
 #include <stdlib.h>
 #include "cryptlib.h"
 #include <openssl/tmdiff.h>
+#if !defined(OPENSSL_SYS_MSDOS)
+#include OPENSSL_UNISTD
+#endif
 
 #ifdef TIMEB
 #undef OPENSSL_SYS_WIN32
@@ -101,14 +104,19 @@
 
 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#   define HZ  100.0
-#  else /* _BSD_CLK_TCK_ */
-#   define HZ ((double)_BSD_CLK_TCK_)
+# if defined(_SC_CLK_TCK) \
+     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
+#  define HZ ((double)sysconf(_SC_CLK_TCK))
+# else
+#  ifndef CLK_TCK
+#   ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
+#    define HZ  100.0
+#   else /* _BSD_CLK_TCK_ */
+#    define HZ ((double)_BSD_CLK_TCK_)
+#   endif
+#  else /* CLK_TCK */
+#   define HZ ((double)CLK_TCK)
 #  endif
-# else /* CLK_TCK */
-#  define HZ ((double)CLK_TCK)
 # endif
 #endif
 

From 711f1a3c266c9ff42e85553a96f36d744670630c Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 23:54:27 +0000
Subject: [PATCH 16/37] Add the ASN.1 structures and functions for
 CertificatePair, which is defined as follows (according to
 X.509_4thEditionDraftV6.pdf):

CertificatePair ::= SEQUENCE {
	forward		[0]	Certificate OPTIONAL,
	reverse		[1]	Certificate OPTIONAL,
	-- at least one of the pair shall be present -- }

The only thing I'm not sure about is if it's implicit or explicit tags
that I should count on.  For now, I'm thinking explicit, but will
gladly stand corrected.

Also implement the PEM functions to read and write certificate pairs,
and defined the PEM tag as "CERTIFICATE PAIR".

This needed to be defined, mostly for the sake of the LDAP attribute
crossCertificatePair, but may prove useful elsewhere as well.
---
 crypto/asn1/x_x509a.c | 6 ++++++
 crypto/pem/pem.h      | 3 +++
 crypto/pem/pem_xaux.c | 1 +
 crypto/x509/x509.h    | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c
index 0c9aa4fd0c412..40f50514b6ac4 100644
--- a/crypto/asn1/x_x509a.c
+++ b/crypto/asn1/x_x509a.c
@@ -172,3 +172,9 @@ void X509_reject_clear(X509 *x)
 	}
 }
 
+ASN1_SEQUENCE(X509_CERT_PAIR) = {
+	ASN1_EXP_OPT(X509_CERT_PAIR, forward, X509, 0),
+	ASN1_EXP_OPT(X509_CERT_PAIR, reverse, X509, 1)
+} ASN1_SEQUENCE_END(X509_CERT_PAIR);
+
+IMPLEMENT_ASN1_FUNCTIONS(X509_CERT_PAIR)
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 5be8d6a957a30..02dd9f2b67e40 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -113,6 +113,7 @@ extern "C" {
 
 #define PEM_STRING_X509_OLD	"X509 CERTIFICATE"
 #define PEM_STRING_X509		"CERTIFICATE"
+#define PEM_STRING_X509_PAIR	"CERTIFICATE PAIR"
 #define PEM_STRING_X509_TRUSTED	"TRUSTED CERTIFICATE"
 #define PEM_STRING_X509_REQ_OLD	"NEW CERTIFICATE REQUEST"
 #define PEM_STRING_X509_REQ	"CERTIFICATE REQUEST"
@@ -548,6 +549,8 @@ DECLARE_PEM_rw(X509, X509)
 
 DECLARE_PEM_rw(X509_AUX, X509)
 
+DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
+
 DECLARE_PEM_rw(X509_REQ, X509_REQ)
 DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
 
diff --git a/crypto/pem/pem_xaux.c b/crypto/pem/pem_xaux.c
index 2f579b5421307..63ce660cf1a2f 100644
--- a/crypto/pem/pem_xaux.c
+++ b/crypto/pem/pem_xaux.c
@@ -66,3 +66,4 @@
 #include <openssl/pem.h>
 
 IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
+IMPLEMENT_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR, PEM_STRING_X509_PAIR, X509_CERT_PAIR)
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 39a9c4c0ab417..f1ccc0f0418ce 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -306,6 +306,11 @@ typedef struct x509_trust_st {
 
 DECLARE_STACK_OF(X509_TRUST)
 
+typedef struct x509_cert_pair_st {
+	X509 *forward;
+	X509 *reverse;
+} X509_CERT_PAIR;
+
 /* standard trust ids */
 
 #define X509_TRUST_DEFAULT	-1	/* Only valid in purpose settings */
@@ -920,6 +925,8 @@ DECLARE_ASN1_FUNCTIONS(X509_CINF)
 DECLARE_ASN1_FUNCTIONS(X509)
 DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
 
+DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)
+
 int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
 	     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int X509_set_ex_data(X509 *r, int idx, void *arg);

From 20199ca80952c2cb4bafbef52d4c6c6307aad680 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 23:56:15 +0000
Subject: [PATCH 17/37] Document the addition of certificate pairs.

---
 CHANGES | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGES b/CHANGES
index f1dcdb40e7341..43a0ffcfb7fa2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,22 @@
 
  Changes between 0.9.7 and 0.9.8  [xx XXX 2002]
 
+  *) Add the ASN.1 structures and functions for CertificatePair, which
+     is defined as follows (according to X.509_4thEditionDraftV6.pdf):
+
+     CertificatePair ::= SEQUENCE {
+	forward		[0]	Certificate OPTIONAL,
+	reverse		[1]	Certificate OPTIONAL,
+	-- at least one of the pair shall be present -- }
+
+     Also implement the PEM functions to read and write certificate
+     pairs, and defined the PEM tag as "CERTIFICATE PAIR".
+
+     This needed to be defined, mostly for the sake of the LDAP
+     attribute crossCertificatePair, but may prove useful elsewhere as
+     well.
+     [Richard Levitte]
+
   *) Make it possible to inhibit symlinking of shared libraries in
      Makefile.shared, for Cygwin's sake.
      [Richard Levitte]

From 9801fb61d03698b9b90036c26aae6fdb7ecddc04 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 18 Nov 2002 23:58:24 +0000
Subject: [PATCH 18/37] Add news items for 0.9.6h and expand on the 0.9.7 news
 as well.

---
 NEWS | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/NEWS b/NEWS
index 418b3b0505476..11460e43f3857 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,11 @@
         a separate distribution.
       o New elliptic curve library section.
       o New AES (Rijndael) library section.
+      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit
+      o Extended support for some platforms: VxWorks
+      o Enhanced support for shared libraries.
+      o Support for pkg-config.
+      o Lots of new manuals.
       o Change DES API to clean up the namespace (some applications link also
         against libdes providing similar functions having the same name).
         Provide macros for backward compatibility (will be removed in the
@@ -30,6 +35,7 @@
       o Reworked parts of the BIGNUM code.
       o Support for new engines: Broadcom ubsec, Accelerated Encryption
         Processing, IBM 4758.
+      o A few new engines added in the demos area.
       o Extended and corrected OID (object identifier) table.
       o PRNG: query at more locations for a random device, automatic query for
         EGD style random sources at several locations.
@@ -40,6 +46,20 @@
       o SSL/TLS: add callback to retrieve SSL/TLS messages.
       o SSL/TLS: support AES cipher suites (RFC3268).
 
+  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
+
+      o New configuration targets for Tandem OSS and A/UX.
+      o New OIDs for Microsoft attributes.
+      o Better handling of SSL session caching.
+      o Better comparison of distinguished names.
+      o Better handling of shared libraries in a mixed GNU/non-GNU environment.
+      o Support assembler code with Borland C.
+      o Fixes for length problems.
+      o Fixes for uninitialised variables.
+      o Fixes for memory leaks, some unusual crashes and some race conditions.
+      o Fixes for smaller building problems.
+      o Updates of manuals, FAQ and other instructive documents.
+
   Major changes between OpenSSL 0.9.6f and OpenSSL 0.9.6g:
 
       o Important building fixes on Unix.

From 25ff76d565024196f48bc8f55d088d950911b369 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Nov 2002 09:34:34 +0000
Subject: [PATCH 19/37] Update STATUS

---
 STATUS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/STATUS b/STATUS
index 40f6414d25d81..8cb519575d5cc 100644
--- a/STATUS
+++ b/STATUS
@@ -1,10 +1,11 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/08/14 11:07:29 $
+  ______________                           $Date: 2002/11/19 09:34:34 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.8:  Under development...
+    o  OpenSSL 0.9.7-beta4: Released on November 19th, 2002
     o  OpenSSL 0.9.7-beta3: Released on July 30th, 2002
     o  OpenSSL 0.9.7-beta2: Released on June 16th, 2002
     o  OpenSSL 0.9.7-beta1: Released on June  1st, 2002

From 821385ad0018be9d2e6821c8c933c48b9b79ecc6 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Nov 2002 11:28:28 +0000
Subject: [PATCH 20/37] Fix an unsigned/signed mismatch.

---
 crypto/bn/bn_gf2m.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index 24906c9c32ec5..826a0497e80a6 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -854,6 +854,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const unsigned int p[], BN_CTX *ctx)
 	{
 	int ret = 0, i, count = 0;
+	unsigned int j;
 	BIGNUM *a, *z, *rho, *w, *w2, *tmp;
 	
 	BN_CTX_start(ctx);
@@ -874,7 +875,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const unsigned int p
 		{
 		/* compute half-trace of a */
 		if (!BN_copy(z, a)) goto err;
-		for (i = 1; i <= (p[0] - 1) / 2; i++)
+		for (j = 1; j <= (p[0] - 1) / 2; j++)
 			{
 			if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
 			if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
@@ -894,7 +895,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const unsigned int p
 			if (!BN_GF2m_mod_arr(rho, rho, p)) goto err;
 			if (!BN_zero(z)) goto err;
 			if (!BN_copy(w, rho)) goto err;
-			for (i = 1; i <= p[0] - 1; i++)
+			for (j = 1; j <= p[0] - 1; j++)
 				{
 				if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
 				if (!BN_GF2m_mod_sqr_arr(w2, w, p, ctx)) goto err;

From fcc764639d4a67dd36d92b8fd7fd94eca58f1fdc Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Nov 2002 11:40:14 +0000
Subject: [PATCH 21/37] make update

---
 TABLE             | 25 +++++++++++++++++++++++++
 test/Makefile.ssl |  2 +-
 util/libeay.num   | 10 ++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/TABLE b/TABLE
index 3cdc0b9109fec..eeac5fe193709 100644
--- a/TABLE
+++ b/TABLE
@@ -875,6 +875,31 @@ $shared_extension =
 $ranlib       = 
 $arflags      = 
 
+*** VC-CE
+$cc           = cl
+$cflags       = 
+$unistd       = 
+$thread_cflag = 
+$sys_id       = WINCE
+$lflags       = 
+$bn_ops       = BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN RC4_INDEX MD2_INT
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = win32
+$shared_target= 
+$shared_cflag = 
+$shared_ldflag = 
+$shared_extension = 
+$ranlib       = 
+$arflags      = 
+
 *** VC-MSDOS
 $cc           = cl
 $cflags       = 
diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 68c5ebca66205..6b4f038fafdfa 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -592,7 +592,7 @@ ecdsatest.o: ../include/openssl/sha.h ../include/openssl/stack.h
 ecdsatest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
 ecdsatest.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
 ecdsatest.o: ../include/openssl/x509_vfy.h ecdsatest.c
-ectest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+ectest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ectest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
 ectest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 ectest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
diff --git a/util/libeay.num b/util/libeay.num
index 8014a3d79dbc8..6c4cf64fc7873 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2977,3 +2977,13 @@ DSO_merge                               3412	EXIST::FUNCTION:
 EC_POINT_hex2point                      3413	EXIST::FUNCTION:EC
 BN_GF2m_mod_inv_arr                     3414	EXIST::FUNCTION:
 ENGINE_unregister_ECDSA                 3415	EXIST::FUNCTION:
+PEM_write_bio_X509_CERT_PAIR            3416	EXIST::FUNCTION:
+PEM_read_X509_CERT_PAIR                 3417	EXIST:!WIN16:FUNCTION:
+X509_CERT_PAIR_it                       3418	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+X509_CERT_PAIR_it                       3418	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+X509_CERT_PAIR_free                     3419	EXIST::FUNCTION:
+i2d_X509_CERT_PAIR                      3420	EXIST::FUNCTION:
+X509_CERT_PAIR_new                      3421	EXIST::FUNCTION:
+PEM_write_X509_CERT_PAIR                3422	EXIST:!WIN16:FUNCTION:
+d2i_X509_CERT_PAIR                      3423	EXIST::FUNCTION:
+PEM_read_bio_X509_CERT_PAIR             3424	EXIST::FUNCTION:

From 229dc0ee31d25aa04a52e08df46483cc866a1336 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Nov 2002 11:52:24 +0000
Subject: [PATCH 22/37] It works on my laptop :-).

---
 STATUS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/STATUS b/STATUS
index 8cb519575d5cc..b15f1493dc2df 100644
--- a/STATUS
+++ b/STATUS
@@ -1,11 +1,12 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/11/19 09:34:34 $
+  ______________                           $Date: 2002/11/19 11:52:24 $
 
   DEVELOPMENT STATE
 
     o  OpenSSL 0.9.8:  Under development...
     o  OpenSSL 0.9.7-beta4: Released on November 19th, 2002
+       Debian GNU/Linux (kernel version 2.4.19, gcc 2.95.4)	- PASSED
     o  OpenSSL 0.9.7-beta3: Released on July 30th, 2002
     o  OpenSSL 0.9.7-beta2: Released on June 16th, 2002
     o  OpenSSL 0.9.7-beta1: Released on June  1st, 2002

From 1e3a9b650f2504af1211275433867cface88a5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Tue, 19 Nov 2002 11:56:05 +0000
Subject: [PATCH 23/37] allocate bio_err before memory debugging is enabled to
 avoid memory leaks (we can't release it before the CRYPTO_mem_leaks() call!)

Submitted by: Nils Larsch
---
 ssl/ssltest.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 035a4d2deb71f..c60a8acddbc62 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -385,7 +385,9 @@ int main(int argc, char *argv[])
 	verbose = 0;
 	debug = 0;
 	cipher = 0;
-	
+
+	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);	
+
 	CRYPTO_set_locking_callback(lock_dbg_cb);
 
 	/* enable memory leak checking unless explicitly disabled */
@@ -403,7 +405,6 @@ int main(int argc, char *argv[])
 
 	RAND_seed(rnd_seed, sizeof rnd_seed);
 
-	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 	bio_stdout=BIO_new_fp(stdout,BIO_NOCLOSE);
 
 	argc--;

From 6a8afe2201cd888e472e44225d3c9ca5fae1ca62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lutz=20J=C3=A4nicke?= <jaenicke@openssl.org>
Date: Wed, 20 Nov 2002 10:48:58 +0000
Subject: [PATCH 24/37] Fix bug introduced by the attempt to fix client side
 external session caching (#288): now internal caching failed (#351): Make
 sure, that cipher_id is set before comparing. Submitted by: Reviewed by: PR:
 288 (and 351)

---
 CHANGES       | 7 +++++++
 ssl/s3_clnt.c | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES b/CHANGES
index 43a0ffcfb7fa2..9104c1fc7b5aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2111,6 +2111,13 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
  Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
 
+  *) Bugfix: client side session caching did not work with external caching,
+     because the session->cipher setting was not restored when reloading
+     from the external cache. This problem was masked, when
+     SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG (part of SSL_OP_ALL) was set.
+     (Found by Steve Haslam <steve@araqnid.ddts.net>.)
+     [Lutz Jaenicke]
+
   *) Fix client_certificate (ssl/s2_clnt.c): The permissible total
      length of the REQUEST-CERTIFICATE message is 18 .. 34, not 17 .. 33.
      [Zeev Lieber <zeev-l@yahoo.com>]
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index bc7523cdf1438..45bea069f2f79 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -722,6 +722,11 @@ static int ssl3_get_server_hello(SSL *s)
 		goto f_err;
 		}
 
+	/* Depending on the session caching (internal/external), the cipher
+	   and/or cipher_id values may not be set. Make sure that
+	   cipher_id is set and use it for comparison. */
+	if (s->session->cipher)
+		s->session->cipher_id = s->session->cipher->id;
 	if (s->hit && (s->session->cipher_id != c->id))
 		{
 		if (!(s->options &

From 137445140ba28906e0424a9252f3fda8c570eda4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Wed, 20 Nov 2002 10:53:33 +0000
Subject: [PATCH 25/37] Make ec_GFp_simple_point_get_affine_coordinates()
 faster for Montgomery representations.

Submitted by: Sheueling Chang, Bodo Moeller
---
 crypto/ec/ecp_smpl.c | 51 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index ad95b03ba60fc..7325abf52055b 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -505,8 +505,8 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
 	BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
-	BIGNUM *X, *Y, *Z, *Z_1, *Z_2, *Z_3;
-	const BIGNUM *X_, *Y_, *Z_;
+	BIGNUM *Z, *Z_1, *Z_2, *Z_3;
+	const BIGNUM *Z_;
 	int ret = 0;
 
 	if (EC_POINT_is_at_infinity(group, point))
@@ -523,8 +523,6 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
 		}
 
 	BN_CTX_start(ctx);
-	X = BN_CTX_get(ctx);
-	Y = BN_CTX_get(ctx);
 	Z = BN_CTX_get(ctx);
 	Z_1 = BN_CTX_get(ctx);
 	Z_2 = BN_CTX_get(ctx);
@@ -535,27 +533,37 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
 	
 	if (group->meth->field_decode)
 		{
-		if (!group->meth->field_decode(group, X, &point->X, ctx)) goto err;
-		if (!group->meth->field_decode(group, Y, &point->Y, ctx)) goto err;
 		if (!group->meth->field_decode(group, Z, &point->Z, ctx)) goto err;
-		X_ = X; Y_ = Y;	Z_ = Z;
+		Z_ = Z;
 		}
 	else
 		{
-		X_ = &point->X;
-		Y_ = &point->Y;
 		Z_ = &point->Z;
 		}
 	
 	if (BN_is_one(Z_))
 		{
-		if (x != NULL)
+		if (group->meth->field_decode)
 			{
-			if (!BN_copy(x, X_)) goto err;
+			if (x != NULL)
+				{
+				if (!group->meth->field_decode(group, x, &point->X, ctx)) goto err;
+				}
+			if (y != NULL)
+				{
+				if (!group->meth->field_decode(group, y, &point->Y, ctx)) goto err;
+				}
 			}
-		if (y != NULL)
+		else
 			{
-			if (!BN_copy(y, Y_)) goto err;
+			if (x != NULL)
+				{
+				if (!BN_copy(x, &point->X)) goto err;
+				}
+			if (y != NULL)
+				{
+				if (!BN_copy(y, &point->Y)) goto err;
+				}
 			}
 		}
 	else
@@ -578,15 +586,8 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
 	
 		if (x != NULL)
 			{
-			if (group->meth->field_encode == 0)
-				{
-				/* field_mul works on standard representation */
-				if (!group->meth->field_mul(group, x, X_, Z_2, ctx)) goto err;
-				}
-			else
-				{
-				if (!BN_mod_mul(x, X_, Z_2, &group->field, ctx)) goto err;
-				}
+			/* in the Montgomery case, field_mul will cancel out Montgomery factor in X: */
+			if (!group->meth->field_mul(group, x, &point->X, Z_2, ctx)) goto err;
 			}
 
 		if (y != NULL)
@@ -595,14 +596,14 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
 				{
 				/* field_mul works on standard representation */
 				if (!group->meth->field_mul(group, Z_3, Z_2, Z_1, ctx)) goto err;
-				if (!group->meth->field_mul(group, y, Y_, Z_3, ctx)) goto err;
-				
 				}
 			else
 				{
 				if (!BN_mod_mul(Z_3, Z_2, Z_1, &group->field, ctx)) goto err;
-				if (!BN_mod_mul(y, Y_, Z_3, &group->field, ctx)) goto err;
 				}
+
+			/* in the Montgomery case, field_mul will cancel out Montgomery factor in Y: */
+			if (!group->meth->field_mul(group, y, &point->Y, Z_3, ctx)) goto err;
 			}
 		}
 

From 8a09b3866a9621210b80106b7512da710b0e17ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Wed, 20 Nov 2002 10:55:27 +0000
Subject: [PATCH 26/37] avoid uninitialized memory read

Submitted by: Nils Larsch
---
 crypto/md32_common.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 353d2b96add8b..86e41bf6df7db 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -1,6 +1,6 @@
 /* crypto/md32_common.h */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -456,7 +456,10 @@ int HASH_UPDATE (HASH_CTX *c, const void *data_, unsigned long len)
 				{
 				ew=(c->num>>2);
 				ec=(c->num&0x03);
-				l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
+				if (sc)
+					l=p[sw];
+				HOST_p_c2l(data,l,sc);
+				p[sw++]=l;
 				for (; sw < ew; sw++)
 					{
 					HOST_c2l(data,l); p[sw]=l;

From 364ff369d15aebe41088b61b97304c391e97480b Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 21 Nov 2002 22:39:08 +0000
Subject: [PATCH 27/37] Mention a current showstopper

---
 STATUS | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/STATUS b/STATUS
index b15f1493dc2df..0d7707d0b6db1 100644
--- a/STATUS
+++ b/STATUS
@@ -1,6 +1,6 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/11/19 11:52:24 $
+  ______________                           $Date: 2002/11/21 22:39:08 $
 
   DEVELOPMENT STATE
 
@@ -33,6 +33,18 @@
     o BN_mod_mul verification fails for mips3-sgi-irix
       unless configured with no-asm
 
+    o [2002-11-21]
+      PR 343 mentions that scrubbing memory with 'memset(ptr, 0, n)' may
+      be optimized away in modern compilers.  This is definitely not good
+      and needs to be fixed immediately.  The formula to use is presented
+      in:
+
+      http://online.securityfocus.com/archive/82/297918/2002-10-27/2002-11-02/0
+
+      The problem report that mentions this is:
+
+      https://www.aet.TU-Cottbus.DE/rt2/Ticket/Display.html?id=343
+
   AVAILABLE PATCHES
 
     o 

From d020e701bbb66c46ca208100a9ef752e5d2ad918 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 22 Nov 2002 08:40:34 +0000
Subject: [PATCH 28/37] Typo.  OPENSSL_NO_ECDH, not NO_OPENSSL_ECDH

---
 ssl/s3_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 043eb02d550d0..fbd5ff54da61a 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2087,7 +2087,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
 #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH)
 err:
 #endif
-#ifndef NO_OPENSSL_ECDH
+#ifndef OPENSSL_NO_ECDH
 	EVP_PKEY_free(clnt_pub_pkey);
 	EC_POINT_free(clnt_ecpoint);
 	if (srvr_ecdh != NULL) 

From 19aa3705739cc8bde71916b02ab019bab7bb945c Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 22 Nov 2002 08:45:20 +0000
Subject: [PATCH 29/37] Disable this module if OPENSSL_NO_SOCK is defined.

---
 apps/s_socket.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index a88de6c8c85c8..77908b638019d 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -62,7 +62,13 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <openssl/e_os2.h>
+#ifdef FLAT_INC
+#include "e_os.h"
+#else
+#include "../e_os.h"
+#endif
+
+#ifndef OPENSSL_NO_SOCK
 
 /* With IPv6, it looks like Digital has mixed up the proper order of
    recursive header file inclusion, resulting in the compiler complaining
@@ -553,3 +559,5 @@ static struct hostent *GetHostByName(char *name)
 		return(ret);
 		}
 	}
+
+#endif

From 922fa76e26ece9566977f73fe2e21d38a9b036ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Fri, 22 Nov 2002 09:25:35 +0000
Subject: [PATCH 30/37] add a comment

---
 crypto/ec/ecp_smpl.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 7325abf52055b..267134af4b5e5 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -112,6 +112,20 @@ const EC_METHOD *EC_GFp_simple_method(void)
 	}
 
 
+/* Most method functions in this file are designed to work with
+ * non-trivial representations of field elements if necessary
+ * (see ecp_mont.c): while standard modular addition and subtraction
+ * are used, the field_mul and field_sqr methods will be used for
+ * multiplication, and field_encode and field_decode (if defined)
+ * will be used for converting between representations.
+
+ * Functions ec_GFp_simple_points_make_affine() and
+ * ec_GFp_simple_point_get_affine_coordinates() specifically assume
+ * that if a non-trivial representation is used, it is a Montgomery
+ * representation (i.e. 'encoding' means multiplying by some factor R).
+ */
+
+
 int ec_GFp_simple_group_init(EC_GROUP *group)
 	{
 	BN_init(&group->field);

From 15994b034af60ea76cfe4a25fb9e67d595a33dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Sat, 23 Nov 2002 18:16:09 +0000
Subject: [PATCH 31/37] rename some functions to improve consistency

Submitted by: Sheueling Chang
---
 crypto/ec/ec2_mult.c | 31 +++++++++++++++----------------
 crypto/ec/ec2_smpl.c |  4 ++--
 crypto/ec/ec_lcl.h   |  4 ++--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
index 3aef9593545be..eefb41a1578eb 100644
--- a/crypto/ec/ec2_mult.c
+++ b/crypto/ec/ec2_mult.c
@@ -79,7 +79,7 @@
  *     GF(2^m) without precomputation".
  * modified to not require precomputation of c=b^{2^{m-1}}.
  */
-static int Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx)
+static int gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx)
 	{
 	BIGNUM *t1;
 	int ret = 0;
@@ -110,7 +110,7 @@ static int Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx)
  *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
  *     GF(2^m) without precomputation".
  */
-static int Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1, 
+static int gf2m_Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1, 
 	const BIGNUM *x2, const BIGNUM *z2, BN_CTX *ctx)
 	{
 	BIGNUM *t1, *t2;
@@ -138,9 +138,8 @@ static int Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1,
 	return ret;
 	}
 
-/* Compute the affine coordinates x2, y2=z2 for the point (x1/z1) and (x2/x2) in
- * Montgomery projective coordinates.
- * Uses algorithm Mxy in appendix of 
+/* Compute the x, y affine coordinates from the point (x1, z1) (x2, z2) 
+ * using Montgomery point multiplication algorithm Mxy() in appendix of 
  *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
  *     GF(2^m) without precomputation".
  * Returns:
@@ -148,7 +147,7 @@ static int Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1,
  *     1 if return value should be the point at infinity
  *     2 otherwise
  */
-static int Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *x1, 
+static int gf2m_Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *x1, 
 	BIGNUM *z1, BIGNUM *x2, BIGNUM *z2, BN_CTX *ctx)
 	{
 	BIGNUM *t3, *t4, *t5;
@@ -213,7 +212,7 @@ static int Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *
  *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
  *     GF(2^m) without precomputation".
  */
-static int point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	const EC_POINT *point, BN_CTX *ctx)
 	{
 	BIGNUM *x1, *x2, *z1, *z2;
@@ -269,13 +268,13 @@ static int point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scal
 			{
 			if (scalar->d[i] & mask)
 				{
-				if (!Madd(group, &point->X, x1, z1, x2, z2, ctx)) goto err;
-				if (!Mdouble(group, x2, z2, ctx)) goto err;
+				if (!gf2m_Madd(group, &point->X, x1, z1, x2, z2, ctx)) goto err;
+				if (!gf2m_Mdouble(group, x2, z2, ctx)) goto err;
 				}
 			else
 				{
-				if (!Madd(group, &point->X, x2, z2, x1, z1, ctx)) goto err;
-				if (!Mdouble(group, x1, z1, ctx)) goto err;
+				if (!gf2m_Madd(group, &point->X, x2, z2, x1, z1, ctx)) goto err;
+				if (!gf2m_Mdouble(group, x1, z1, ctx)) goto err;
 				}
 			mask >>= 1;
 			}
@@ -284,7 +283,7 @@ static int point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scal
 		}
 
 	/* convert out of "projective" coordinates */
-	i = Mxy(group, &point->X, &point->Y, x1, z1, x2, z2, ctx);
+	i = gf2m_Mxy(group, &point->X, &point->Y, x1, z1, x2, z2, ctx);
 	if (i == 0) goto err;
 	else if (i == 1) 
 		{
@@ -312,7 +311,7 @@ static int point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scal
  *     scalar*group->generator + scalars[0]*points[0] + ... + scalars[num-1]*points[num-1]
  * gracefully ignoring NULL scalar values.
  */
-int ec_GF2m_mont_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
@@ -341,7 +340,7 @@ int ec_GF2m_mont_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
 	if (scalar)
 		{
-		if (!point_multiply(group, p, scalar, group->generator, ctx)) goto err;
+		if (!ec_GF2m_montgomery_point_multiply(group, p, scalar, group->generator, ctx)) goto err;
 		if (BN_get_sign(scalar)) 
 			if (!group->meth->invert(group, p, ctx)) goto err;
 		if (!group->meth->add(group, r, r, p, ctx)) goto err;
@@ -349,7 +348,7 @@ int ec_GF2m_mont_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
 	for (i = 0; i < num; i++)
 		{
-		if (!point_multiply(group, p, scalars[i], points[i], ctx)) goto err;
+		if (!ec_GF2m_montgomery_point_multiply(group, p, scalars[i], points[i], ctx)) goto err;
 		if (BN_get_sign(scalars[i]))
 			if (!group->meth->invert(group, p, ctx)) goto err;
 		if (!group->meth->add(group, r, r, p, ctx)) goto err;
@@ -366,7 +365,7 @@ int ec_GF2m_mont_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
 
 /* Precomputation for point multiplication. */	
-int ec_GF2m_mont_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
+int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
 	{
 	/* There is no precomputation to do for Montgomery scalar multiplication but
 	 * since this implementation falls back to the wNAF multiplication for more than
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 5e37bfaca7ca7..1bc440eed1ae8 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -99,8 +99,8 @@ const EC_METHOD *EC_GF2m_simple_method(void)
 		ec_GF2m_simple_add,
 		ec_GF2m_simple_dbl,
 		ec_GF2m_simple_invert,
-		ec_GF2m_mont_mul,
-		ec_GF2m_mont_precompute_mult,
+		ec_GF2m_simple_mul,
+		ec_GF2m_precompute_mult,
 		ec_GF2m_simple_is_at_infinity,
 		ec_GF2m_simple_is_on_curve,
 		ec_GF2m_simple_cmp,
diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 43649e96ada87..a96d0df1a4156 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -360,6 +360,6 @@ int ec_GF2m_simple_field_div(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const
 
 
 /* method functions in ec2_mult.c */
-int ec_GF2m_mont_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 	size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
-int ec_GF2m_mont_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);

From de868e0b94c4f2ae9cfbe6bfd2fa0d70f62be217 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Nov 2002 09:19:17 +0000
Subject: [PATCH 32/37] Heimdal isn't really supported right now.  Say so, and
 offer a possibility to force the use of Heimdal, and warn if that's used. PR:
 346

---
 Configure | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Configure b/Configure
index 0c04460258b2f..9c439d9bb1a4a 100755
--- a/Configure
+++ b/Configure
@@ -994,6 +994,17 @@ else
 	my ($lresolv, $lpath, $lext);
 	if ($withargs{"krb5-flavor"} =~ /^[Hh]eimdal$/)
 		{
+		die "Sorry, Heimdal is currently not supported\n";
+		}
+	##### HACK to force use of Heimdal.
+	##### WARNING: Since we don't really have adequate support for Heimdal,
+	#####          using this will break the build.  You'll have to make
+	#####          changes to the source, and if you do, please send
+	#####          patches to openssl-dev@openssl.org
+	if ($withargs{"krb5-flavor"} =~ /^force-[Hh]eimdal$/)
+		{
+		warn "Heimdal isn't really supported.  Your build WILL break\n";
+		warn "If you fix the problems, please send a patch to openssl-dev@openssl.org\n";
 		$withargs{"krb5-dir"} = "/usr/heimdal"
 			if $withargs{"krb5-dir"} eq "";
 		$withargs{"krb5-lib"} = "-L".$withargs{"krb5-dir"}.

From 31be2daa06d19dc5d24daf0376e47e4b820607b3 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Nov 2002 10:09:36 +0000
Subject: [PATCH 33/37] Small bugfixes to the KSSL implementation. PR: 349

---
 ssl/kssl.h    | 3 +--
 ssl/ssl3.h    | 2 +-
 ssl/ssltest.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ssl/kssl.h b/ssl/kssl.h
index 0cfd219bf4f9c..cf7ebdd168ed9 100644
--- a/ssl/kssl.h
+++ b/ssl/kssl.h
@@ -110,13 +110,12 @@ typedef unsigned char krb5_octet;
 #define	KSSL_CLOCKSKEW	300;
 #endif
 
-/* Unused
 #define	KSSL_ERR_MAX	255
 typedef struct kssl_err_st  {
 	int  reason;
 	char text[KSSL_ERR_MAX+1];
 	} KSSL_ERR;
-*/
+
 
 /*	Context for passing
 **		(1) Kerberos session key to SSL, and
diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index b829791abd739..796dcbc52875e 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -233,7 +233,7 @@ extern "C" {
 #define SSL3_TXT_KRB5_RC2_40_CBC_SHA 		"EXP-KRB5-RC2-CBC-SHA"
 #define SSL3_TXT_KRB5_RC4_40_SHA	 	"EXP-KRB5-RC4-SHA"
 #define SSL3_TXT_KRB5_DES_40_CBC_MD5 		"EXP-KRB5-DES-CBC-MD5"
-#define SSL3_TXT_KRB5_DES_40_CBC_MD5 		"EXP-KRB5-DES-CBC-MD5"
+#define SSL3_TXT_KRB5_RC2_40_CBC_MD5 		"EXP-KRB5-RC2-CBC-MD5"
 #define SSL3_TXT_KRB5_RC4_40_MD5	 	"EXP-KRB5-RC4-MD5"
 
 #define SSL3_SSL_SESSION_ID_LENGTH		32
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index c60a8acddbc62..fbdd2a9c41ec2 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -766,7 +766,7 @@ int main(int argc, char *argv[])
 			if(strlen(localhost) == sizeof localhost-1)
 				{
 				BIO_printf(bio_err,"localhost name too long\n");
-				got end;
+				goto end;
 				}
 			kssl_ctx_setstring(c_ssl->kssl_ctx, KSSL_SERVER,
                                 localhost);

From 17582ccf21912342b1aeaa60f44c55abc7779a00 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Nov 2002 10:11:58 +0000
Subject: [PATCH 34/37] Heimdal isn't really supported right now.  Say so, and
 offer a possibility to force the use of Heimdal, and warn if that's used. PR:
 346

---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9104c1fc7b5aa..f5bda1b694942 100644
--- a/CHANGES
+++ b/CHANGES
@@ -335,6 +335,11 @@ TODO: bug: pad  x  with leading zeros if necessary
  
  Changes between 0.9.6h and 0.9.7  [XX xxx 2002]
 
+  *) Disable Heimdal support, since it hasn't been fully implemented.
+     Still give the possibility to force the use of Heimdal, but with
+     warnings and a request that patches get sent to openssl-dev.
+     [Richard Levitte]
+
   *) Add the VC-CE target, introduce the WINCE sysname, and add
      INSTALL.WCE and appropriate conditionals to make it build.
      [Steven Reddie <smr@essemer.com.au> via Richard Levitte]

From ba8ad074905ac260117a983237bc61a488e9fb1e Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Nov 2002 11:14:32 +0000
Subject: [PATCH 35/37] The logic in the main signing and verifying functions
 to check lengths was incorrect.  Fortunately, there is a second check that's
 correct, when adding the pads. PR: 355

---
 crypto/rsa/rsa.h      | 2 ++
 crypto/rsa/rsa_pk1.c  | 2 +-
 crypto/rsa/rsa_saos.c | 2 +-
 crypto/rsa/rsa_sign.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 98b3bd7cc5282..b2e25e4e7c714 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -175,6 +175,8 @@ struct rsa_st
 #define RSA_NO_PADDING		3
 #define RSA_PKCS1_OAEP_PADDING	4
 
+#define RSA_PKCS1_PADDING_SIZE	11
+
 #define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
 #define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
 
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index c1edd6764fc0e..8560755f1d12d 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -68,7 +68,7 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
 	int j;
 	unsigned char *p;
 
-	if (flen > (tlen-11))
+	if (flen > (tlen-RSA_PKCS1_PADDING_SIZE))
 		{
 		RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
 		return(0);
diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
index 85adacc08fdec..423cb50652235 100644
--- a/crypto/rsa/rsa_saos.c
+++ b/crypto/rsa/rsa_saos.c
@@ -77,7 +77,7 @@ int RSA_sign_ASN1_OCTET_STRING(int type,
 
 	i=i2d_ASN1_OCTET_STRING(&sig,NULL);
 	j=RSA_size(rsa);
-	if ((i-RSA_PKCS1_PADDING) > j)
+	if (i > (j-RSA_PKCS1_PADDING_SIZE))
 		{
 		RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
 		return(0);
diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 2a440901de3ee..c53ca739149b6 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -113,7 +113,7 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
 		i=i2d_X509_SIG(&sig,NULL);
 	}
 	j=RSA_size(rsa);
-	if ((i-RSA_PKCS1_PADDING) > j)
+	if (i > (j-RSA_PKCS1_PADDING_SIZE))
 		{
 		RSAerr(RSA_F_RSA_SIGN,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
 		return(0);

From ec7164133d09b1a8368ad064f501ab163f5cfebb Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 26 Nov 2002 15:27:05 +0000
Subject: [PATCH 36/37] I forgot that @ in strings must be escaped in Perl

---
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 9c439d9bb1a4a..3f5013588062a 100755
--- a/Configure
+++ b/Configure
@@ -1004,7 +1004,7 @@ else
 	if ($withargs{"krb5-flavor"} =~ /^force-[Hh]eimdal$/)
 		{
 		warn "Heimdal isn't really supported.  Your build WILL break\n";
-		warn "If you fix the problems, please send a patch to openssl-dev@openssl.org\n";
+		warn "If you fix the problems, please send a patch to openssl-dev\@openssl.org\n";
 		$withargs{"krb5-dir"} = "/usr/heimdal"
 			if $withargs{"krb5-dir"} eq "";
 		$withargs{"krb5-lib"} = "-L".$withargs{"krb5-dir"}.

From df29cc8f77bcf09cdd245feeaea452f5f91e4125 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 27 Nov 2002 12:24:05 +0000
Subject: [PATCH 37/37] Add OPENSSL_cleanse() to help cleanse memory and avoid
 certain compiler and linker optimizations. PR: 343

---
 CHANGES               |   8 +
 crypto/Makefile.ssl   |   8 +-
 crypto/crypto-lib.com |   2 +-
 crypto/crypto.h       |   2 +
 crypto/mem.c          |  14 ++
 crypto/mem_clr.c      |  75 +++++++++
 util/libeay.num       | 375 +++++++++++++++++++++---------------------
 7 files changed, 294 insertions(+), 190 deletions(-)
 create mode 100644 crypto/mem_clr.c

diff --git a/CHANGES b/CHANGES
index f5bda1b694942..2d7c5b5f50827 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2116,6 +2116,14 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
 
  Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
 
+  *) New function OPENSSL_cleanse(), which is used to cleanse a section of
+     memory from it's contents.  This is done with a counter that will
+     place alternating values in each byte.  This can be used to solve
+     two issues: 1) the removal of calls to memset() by highly optimizing
+     compilers, and 2) cleansing with other values than 0, since those can
+     be read through on certain media, for example a swap space on disk.
+     [Geoff Thorpe]
+
   *) Bugfix: client side session caching did not work with external caching,
      because the session->cipher setting was not restored when reloading
      from the external cache. This problem was masked, when
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 574fd7286bbe6..061211dbd403f 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -36,8 +36,8 @@ GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=	cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o
+LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
+LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o
 
 SRC= $(LIBSRC)
 
@@ -193,6 +193,10 @@ mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
 mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 mem.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 mem.o: ../include/openssl/symhacks.h cryptlib.h mem.c
+mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+mem_clr.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+mem_clr.o: ../include/openssl/symhacks.h mem_clr.c
 mem_dbg.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h
diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 5d42b2b6a0d04..ced978cf14568 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -158,7 +158,7 @@ $!
 $ APPS_DES = "DES/DES,CBC3_ENC"
 $ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"
 $
-$ LIB_ = "cryptlib,mem,mem_dbg,cversion,ex_data,tmdiff,cpt_err,ebcdic,uid,o_time"
+$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,tmdiff,cpt_err,ebcdic,uid,o_time"
 $ LIB_MD2 = "md2_dgst,md2_one"
 $ LIB_MD4 = "md4_dgst,md4_one"
 $ LIB_MD5 = "md5_dgst,md5_one"
diff --git a/crypto/crypto.h b/crypto/crypto.h
index d1d2400d87e84..4027b4306cf74 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -454,6 +454,8 @@ void *CRYPTO_realloc_clean(void *addr,int old_num,int num,const char *file,
 			   int line);
 void *CRYPTO_remalloc(void *addr,int num, const char *file, int line);
 
+void OPENSSL_cleanse(void *ptr, size_t len);
+
 void CRYPTO_set_mem_debug_options(long bits);
 long CRYPTO_get_mem_debug_options(void);
 
diff --git a/crypto/mem.c b/crypto/mem.c
index 03d2569bced7c..46a00697ce221 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -250,6 +250,7 @@ void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
 void *CRYPTO_malloc_locked(int num, const char *file, int line)
 	{
 	void *ret = NULL;
+	extern unsigned char cleanse_ctr;
 
 	allow_customize = 0;
 	if (malloc_debug_func != NULL)
@@ -264,6 +265,12 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
 	if (malloc_debug_func != NULL)
 		malloc_debug_func(ret, num, file, line, 1);
 
+        /* Create a dependency on the value of 'cleanse_ctr' so our memory
+         * sanitisation function can't be optimised out. NB: We only do
+         * this for >2Kb so the overhead doesn't bother us. */
+        if(ret && (num > 2048))
+		((unsigned char *)ret)[0] = cleanse_ctr;
+
 	return ret;
 	}
 
@@ -282,6 +289,7 @@ void CRYPTO_free_locked(void *str)
 void *CRYPTO_malloc(int num, const char *file, int line)
 	{
 	void *ret = NULL;
+	extern unsigned char cleanse_ctr;
 
 	allow_customize = 0;
 	if (malloc_debug_func != NULL)
@@ -296,6 +304,12 @@ void *CRYPTO_malloc(int num, const char *file, int line)
 	if (malloc_debug_func != NULL)
 		malloc_debug_func(ret, num, file, line, 1);
 
+        /* Create a dependency on the value of 'cleanse_ctr' so our memory
+         * sanitisation function can't be optimised out. NB: We only do
+         * this for >2Kb so the overhead doesn't bother us. */
+        if(ret && (num > 2048))
+                ((unsigned char *)ret)[0] = cleanse_ctr;
+
 	return ret;
 	}
 
diff --git a/crypto/mem_clr.c b/crypto/mem_clr.c
new file mode 100644
index 0000000000000..0b72966cfa1b4
--- /dev/null
+++ b/crypto/mem_clr.c
@@ -0,0 +1,75 @@
+/* crypto/mem_clr.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ *
+ * 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 above 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 acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED 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 OpenSSL PROJECT OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/crypto.h>
+
+unsigned char cleanse_ctr = 0;
+
+void OPENSSL_cleanse(void *ptr, size_t len)
+	{
+	unsigned char *p = ptr;
+	size_t loop = len;
+	while(loop--)
+		{
+		*(p++) = cleanse_ctr;
+		cleanse_ctr += (17 + (((unsigned char *)&p)[sizeof(unsigned char *)-1] & 0xF));
+		}
+	if(memchr(ptr, cleanse_ctr, len))
+		cleanse_ctr += 63;
+	}
diff --git a/util/libeay.num b/util/libeay.num
index 6c4cf64fc7873..dc2cedc1e22be 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2800,190 +2800,191 @@ BUF_strlcat                             3241	EXIST::FUNCTION:
 BIO_indent                              3242	EXIST::FUNCTION:
 BUF_strlcpy                             3243	EXIST::FUNCTION:
 OpenSSLDie                              3244	EXIST::FUNCTION:
-BN_get0_nist_prime_384                  3245	EXIST::FUNCTION:
-ENGINE_register_ECDSA                   3246	EXIST::FUNCTION:
-BN_nist_mod_192                         3247	EXIST::FUNCTION:
-EC_GROUP_get_trinomial_basis            3248	EXIST::FUNCTION:EC
-ECDH_get_default_method                 3249	EXIST::FUNCTION:ECDH
-PKCS12_add_safe                         3250	EXIST::FUNCTION:
-ENGINE_register_ECDH                    3251	EXIST::FUNCTION:
-i2d_ECPrivateKey                        3252	EXIST::FUNCTION:EC
-BN_get0_nist_prime_192                  3253	EXIST::FUNCTION:
-EC_POINT_set_affine_coordinates_GF2m    3254	EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_affine_coords_GF2m         3254	EXIST:VMS:FUNCTION:EC
-BN_GF2m_mod_exp_arr                     3255	EXIST::FUNCTION:
-X509_keyid_get0                         3256	EXIST::FUNCTION:
-EC_GROUP_new_by_nid                     3257	EXIST::FUNCTION:EC
-BN_GF2m_mod_mul_arr                     3258	EXIST::FUNCTION:
-EC_KEY_copy                             3259	EXIST::FUNCTION:EC
-EC_GROUP_check_discriminant             3260	EXIST::FUNCTION:EC
-EC_POINT_point2bn                       3261	EXIST::FUNCTION:EC
-EC_GROUP_new_curve_GF2m                 3262	EXIST::FUNCTION:EC
-EVP_PKEY_get1_EC_KEY                    3263	EXIST::FUNCTION:EC
-ENGINE_get_default_ECDH                 3264	EXIST::FUNCTION:
-ASN1_OCTET_STRING_NDEF_it               3265	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_OCTET_STRING_NDEF_it               3265	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-ENGINE_get_static_state                 3266	EXIST::FUNCTION:
-ECDSA_SIG_new                           3267	EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_sqr                         3268	EXIST::FUNCTION:
-EC_POINT_bn2point                       3269	EXIST::FUNCTION:EC
-EC_GROUP_get_point_conversion_form      3270	EXIST:!VMS:FUNCTION:EC
-EC_GROUP_get_point_conv_form            3270	EXIST:VMS:FUNCTION:EC
-PEM_read_bio_ECPKParameters             3271	EXIST::FUNCTION:EC
-EC_GROUP_get_pentanomial_basis          3272	EXIST::FUNCTION:EC
-EC_GROUP_get_nid                        3273	EXIST::FUNCTION:EC
-ECDSA_sign_setup                        3274	EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_solve_quad_arr              3275	EXIST::FUNCTION:
-EC_KEY_up_ref                           3276	EXIST::FUNCTION:EC
-BN_GF2m_mod_div                         3277	EXIST::FUNCTION:
-EC_KEY_free                             3278	EXIST::FUNCTION:EC
-PEM_write_bio_ECPrivateKey              3279	EXIST::FUNCTION:EC
-d2i_EC_PUBKEY                           3280	EXIST::FUNCTION:EC
-EC_KEY_print_fp                         3281	EXIST::FUNCTION:EC,FP_API
-BN_GF2m_mod_arr                         3282	EXIST::FUNCTION:
-ECDH_get_ex_data                        3283	EXIST::FUNCTION:ECDH
-ECDSA_do_sign                           3284	EXIST::FUNCTION:ECDSA
-ENGINE_unregister_ECDH                  3285	EXIST::FUNCTION:
-ECDH_OpenSSL                            3286	EXIST::FUNCTION:ECDH
-EC_POINT_dup                            3287	EXIST::FUNCTION:EC
-EC_get_builtin_curves                   3288	EXIST::FUNCTION:EC
-EVP_PKEY_set1_EC_KEY                    3289	EXIST::FUNCTION:EC
-BN_GF2m_mod_sqrt_arr                    3290	EXIST::FUNCTION:
-i2d_ECPrivateKey_bio                    3291	EXIST::FUNCTION:BIO,EC
-ECPKParameters_print_fp                 3292	EXIST::FUNCTION:EC,FP_API
-ECDSA_SIG_free                          3293	EXIST::FUNCTION:ECDSA
-PEM_write_bio_ECPKParameters            3294	EXIST::FUNCTION:EC
-EC_GROUP_set_nid                        3295	EXIST::FUNCTION:EC
-PKCS12_add_safes                        3296	EXIST::FUNCTION:
-BN_GF2m_poly2arr                        3297	EXIST::FUNCTION:
-BN_get0_nist_prime_224                  3298	EXIST::FUNCTION:
-i2d_ECParameters                        3299	EXIST::FUNCTION:EC
-i2d_ECPKParameters                      3300	EXIST::FUNCTION:EC
-BN_ncopy                                3301	EXIST::FUNCTION:
-d2i_ECPKParameters                      3302	EXIST::FUNCTION:EC
-ENGINE_set_ECDH                         3303	EXIST::FUNCTION:
-PEM_write_bio_EC_PUBKEY                 3304	EXIST::FUNCTION:EC
-ECParameters_print                      3305	EXIST::FUNCTION:BIO,EC
-ASN1_generate_nconf                     3306	EXIST::FUNCTION:
-BN_GF2m_mod_mul                         3307	EXIST::FUNCTION:
-EC_GROUP_set_seed                       3308	EXIST::FUNCTION:EC
-EC_GROUP_get_curve_GF2m                 3309	EXIST::FUNCTION:EC
-ECPublicKey_set_octet_string            3310	EXIST::FUNCTION:EC
-ECDSA_get_ex_data                       3311	EXIST::FUNCTION:ECDSA
-BN_GF2m_mod                             3312	EXIST::FUNCTION:
-EC_GROUP_get_seed_len                   3313	EXIST::FUNCTION:EC
-PEM_read_bio_EC_PUBKEY                  3314	EXIST::FUNCTION:EC
-i2d_EC_PUBKEY                           3315	EXIST::FUNCTION:EC
-ECDSA_get_default_method                3316	EXIST::FUNCTION:ECDSA
-ASN1_put_eoc                            3317	EXIST::FUNCTION:
-ECDSA_DATA_free                         3318	EXIST::FUNCTION:ECDSA
-EC_METHOD_get_field_type                3319	EXIST::FUNCTION:EC
-EC_GFp_nist_method                      3320	EXIST::FUNCTION:EC
-BN_GF2m_mod_sqr_arr                     3321	EXIST::FUNCTION:
-EC_GROUP_set_curve_GF2m                 3322	EXIST::FUNCTION:EC
-ENGINE_set_default_ECDSA                3323	EXIST::FUNCTION:
-BN_GF2m_mod_sqrt                        3324	EXIST::FUNCTION:
-ECDH_set_default_method                 3325	EXIST::FUNCTION:ECDH
-EC_KEY_generate_key                     3326	EXIST::FUNCTION:EC
-BN_GF2m_arr2poly                        3327	EXIST::FUNCTION:
-ECPublicKey_get_octet_string            3328	EXIST::FUNCTION:EC
-EC_GROUP_check                          3329	EXIST::FUNCTION:EC
-d2i_ECPrivateKey_bio                    3330	EXIST::FUNCTION:BIO,EC
-d2i_ECPrivateKey                        3331	EXIST::FUNCTION:EC
-ASN1_item_ndef_i2d                      3332	EXIST::FUNCTION:
-i2d_PKCS7_NDEF                          3333	EXIST::FUNCTION:
-EC_GROUP_get_degree                     3334	EXIST::FUNCTION:EC
-ASN1_generate_v3                        3335	EXIST::FUNCTION:
-BN_GF2m_add                             3336	EXIST::FUNCTION:
-BN_nist_mod_224                         3337	EXIST::FUNCTION:
-i2d_EC_PUBKEY_bio                       3338	EXIST::FUNCTION:BIO,EC
-EC_GROUP_get_asn1_flag                  3339	EXIST::FUNCTION:EC
-ECDH_get_ex_new_index                   3340	EXIST::FUNCTION:ECDH
-ECDH_size                               3341	EXIST::FUNCTION:ECDH
-BN_GF2m_mod_inv                         3342	EXIST::FUNCTION:
-BN_GF2m_mod_exp                         3343	EXIST::FUNCTION:
-EC_GROUP_get0_seed                      3344	EXIST::FUNCTION:EC
-ecdsa_check                             3345	EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_div_arr                     3346	EXIST::FUNCTION:
-ENGINE_set_ECDSA                        3347	EXIST::FUNCTION:
-ECPKParameters_print                    3348	EXIST::FUNCTION:BIO,EC
-PEM_write_EC_PUBKEY                     3349	EXIST:!WIN16:FUNCTION:EC
-ECDH_set_method                         3350	EXIST::FUNCTION:ECDH
-ECDH_set_ex_data                        3351	EXIST::FUNCTION:ECDH
-BN_nist_mod_521                         3352	EXIST::FUNCTION:
-EC_GROUP_set_point_conversion_form      3353	EXIST:!VMS:FUNCTION:EC
-EC_GROUP_set_point_conv_form            3353	EXIST:VMS:FUNCTION:EC
-PEM_read_EC_PUBKEY                      3354	EXIST:!WIN16:FUNCTION:EC
-i2d_ECDSA_SIG                           3355	EXIST::FUNCTION:ECDSA
-ECDSA_OpenSSL                           3356	EXIST::FUNCTION:ECDSA
-ECDSA_set_default_method                3357	EXIST::FUNCTION:ECDSA
-EC_POINT_set_compressed_coordinates_GF2m 3358	EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_compr_coords_GF2m          3358	EXIST:VMS:FUNCTION:EC
-ECDH_DATA_new_method                    3359	EXIST::FUNCTION:ECDH
-BN_get0_nist_prime_256                  3360	EXIST::FUNCTION:
-PEM_read_ECPrivateKey                   3361	EXIST:!WIN16:FUNCTION:EC
-ERR_load_ECDSA_strings                  3362	EXIST::FUNCTION:ECDSA
-EC_GROUP_get_basis_type                 3363	EXIST::FUNCTION:EC
-ECDH_DATA_new                           3364	EXIST::FUNCTION:ECDH
-BN_nist_mod_384                         3365	EXIST::FUNCTION:
-PEM_write_ECPKParameters                3366	EXIST:!WIN16:FUNCTION:EC
-ECDH_compute_key                        3367	EXIST::FUNCTION:ECDH
-ENGINE_register_all_ECDH                3368	EXIST::FUNCTION:
-BN_GF2m_mod_solve_quad                  3369	EXIST::FUNCTION:
-i2d_ECPrivateKey_fp                     3370	EXIST::FUNCTION:EC,FP_API
-ENGINE_register_all_ECDSA               3371	EXIST::FUNCTION:
-EC_POINT_get_affine_coordinates_GF2m    3372	EXIST:!VMS:FUNCTION:EC
-EC_POINT_get_affine_coords_GF2m         3372	EXIST:VMS:FUNCTION:EC
-EC_GROUP_dup                            3373	EXIST::FUNCTION:EC
-ENGINE_get_default_ECDSA                3374	EXIST::FUNCTION:
-EC_KEY_new                              3375	EXIST::FUNCTION:EC
-ECDSA_verify                            3376	EXIST::FUNCTION:ECDSA
-EC_POINT_point2hex                      3377	EXIST::FUNCTION:EC
-ECDSA_do_verify                         3378	EXIST::FUNCTION:ECDSA
-d2i_ECPrivateKey_fp                     3379	EXIST::FUNCTION:EC,FP_API
-PEM_write_ECPrivateKey                  3380	EXIST:!WIN16:FUNCTION:EC
-PEM_read_ECPKParameters                 3381	EXIST:!WIN16:FUNCTION:EC
-ECParameters_print_fp                   3382	EXIST::FUNCTION:EC,FP_API
-ECDH_DATA_free                          3383	EXIST::FUNCTION:ECDH
-i2d_EC_PUBKEY_fp                        3384	EXIST::FUNCTION:EC,FP_API
-BN_nist_mod_256                         3385	EXIST::FUNCTION:
-ECDSA_DATA_new                          3386	EXIST::FUNCTION:ECDSA
-ECDSA_size                              3387	EXIST::FUNCTION:ECDSA
-d2i_EC_PUBKEY_bio                       3388	EXIST::FUNCTION:BIO,EC
-BN_get0_nist_prime_521                  3389	EXIST::FUNCTION:
-PEM_read_bio_ECPrivateKey               3390	EXIST::FUNCTION:EC
-ENGINE_get_ECDH                         3391	EXIST::FUNCTION:
-d2i_ECDSA_SIG                           3392	EXIST::FUNCTION:ECDSA
-ECDSA_sign                              3393	EXIST::FUNCTION:ECDSA
-ENGINE_get_ECDSA                        3394	EXIST::FUNCTION:
-EVP_ecdsa                               3395	EXIST::FUNCTION:SHA
-PKCS12_add_cert                         3396	EXIST::FUNCTION:
-ERR_load_ECDH_strings                   3397	EXIST::FUNCTION:ECDH
-EC_KEY_dup                              3398	EXIST::FUNCTION:EC
-ECDSA_set_method                        3399	EXIST::FUNCTION:ECDSA
-d2i_ECParameters                        3400	EXIST::FUNCTION:EC
-EC_GF2m_simple_method                   3401	EXIST::FUNCTION:EC
-ECDSA_set_ex_data                       3402	EXIST::FUNCTION:ECDSA
-EC_KEY_print                            3403	EXIST::FUNCTION:BIO,EC
-ECDSA_get_ex_new_index                  3404	EXIST::FUNCTION:ECDSA
-EC_GROUP_set_asn1_flag                  3405	EXIST::FUNCTION:EC
-EC_KEY_check_key                        3406	EXIST::FUNCTION:EC
-d2i_EC_PUBKEY_fp                        3407	EXIST::FUNCTION:EC,FP_API
-ecdh_check                              3408	EXIST::FUNCTION:ECDH
-ECDSA_DATA_new_method                   3409	EXIST::FUNCTION:ECDSA
-ENGINE_set_default_ECDH                 3410	EXIST::FUNCTION:
-PKCS12_add_key                          3411	EXIST::FUNCTION:
-DSO_merge                               3412	EXIST::FUNCTION:
-EC_POINT_hex2point                      3413	EXIST::FUNCTION:EC
-BN_GF2m_mod_inv_arr                     3414	EXIST::FUNCTION:
-ENGINE_unregister_ECDSA                 3415	EXIST::FUNCTION:
-PEM_write_bio_X509_CERT_PAIR            3416	EXIST::FUNCTION:
-PEM_read_X509_CERT_PAIR                 3417	EXIST:!WIN16:FUNCTION:
-X509_CERT_PAIR_it                       3418	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-X509_CERT_PAIR_it                       3418	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-X509_CERT_PAIR_free                     3419	EXIST::FUNCTION:
-i2d_X509_CERT_PAIR                      3420	EXIST::FUNCTION:
-X509_CERT_PAIR_new                      3421	EXIST::FUNCTION:
-PEM_write_X509_CERT_PAIR                3422	EXIST:!WIN16:FUNCTION:
-d2i_X509_CERT_PAIR                      3423	EXIST::FUNCTION:
-PEM_read_bio_X509_CERT_PAIR             3424	EXIST::FUNCTION:
+OPENSSL_cleanse                         3245	EXIST::FUNCTION:
+BN_get0_nist_prime_384                  3246	EXIST::FUNCTION:
+ENGINE_register_ECDSA                   3247	EXIST::FUNCTION:
+BN_nist_mod_192                         3248	EXIST::FUNCTION:
+EC_GROUP_get_trinomial_basis            3249	EXIST::FUNCTION:EC
+ECDH_get_default_method                 3250	EXIST::FUNCTION:ECDH
+PKCS12_add_safe                         3251	EXIST::FUNCTION:
+ENGINE_register_ECDH                    3252	EXIST::FUNCTION:
+i2d_ECPrivateKey                        3253	EXIST::FUNCTION:EC
+BN_get0_nist_prime_192                  3254	EXIST::FUNCTION:
+EC_POINT_set_affine_coordinates_GF2m    3255	EXIST:!VMS:FUNCTION:EC
+EC_POINT_set_affine_coords_GF2m         3255	EXIST:VMS:FUNCTION:EC
+BN_GF2m_mod_exp_arr                     3256	EXIST::FUNCTION:
+X509_keyid_get0                         3257	EXIST::FUNCTION:
+EC_GROUP_new_by_nid                     3258	EXIST::FUNCTION:EC
+BN_GF2m_mod_mul_arr                     3259	EXIST::FUNCTION:
+EC_KEY_copy                             3260	EXIST::FUNCTION:EC
+EC_GROUP_check_discriminant             3261	EXIST::FUNCTION:EC
+EC_POINT_point2bn                       3262	EXIST::FUNCTION:EC
+EC_GROUP_new_curve_GF2m                 3263	EXIST::FUNCTION:EC
+EVP_PKEY_get1_EC_KEY                    3264	EXIST::FUNCTION:EC
+ENGINE_get_default_ECDH                 3265	EXIST::FUNCTION:
+ASN1_OCTET_STRING_NDEF_it               3266	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ASN1_OCTET_STRING_NDEF_it               3266	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ENGINE_get_static_state                 3267	EXIST::FUNCTION:
+ECDSA_SIG_new                           3268	EXIST::FUNCTION:ECDSA
+BN_GF2m_mod_sqr                         3269	EXIST::FUNCTION:
+EC_POINT_bn2point                       3270	EXIST::FUNCTION:EC
+EC_GROUP_get_point_conversion_form      3271	EXIST:!VMS:FUNCTION:EC
+EC_GROUP_get_point_conv_form            3271	EXIST:VMS:FUNCTION:EC
+PEM_read_bio_ECPKParameters             3272	EXIST::FUNCTION:EC
+EC_GROUP_get_pentanomial_basis          3273	EXIST::FUNCTION:EC
+EC_GROUP_get_nid                        3274	EXIST::FUNCTION:EC
+ECDSA_sign_setup                        3275	EXIST::FUNCTION:ECDSA
+BN_GF2m_mod_solve_quad_arr              3276	EXIST::FUNCTION:
+EC_KEY_up_ref                           3277	EXIST::FUNCTION:EC
+BN_GF2m_mod_div                         3278	EXIST::FUNCTION:
+EC_KEY_free                             3279	EXIST::FUNCTION:EC
+PEM_write_bio_ECPrivateKey              3280	EXIST::FUNCTION:EC
+d2i_EC_PUBKEY                           3281	EXIST::FUNCTION:EC
+EC_KEY_print_fp                         3282	EXIST::FUNCTION:EC,FP_API
+BN_GF2m_mod_arr                         3283	EXIST::FUNCTION:
+PEM_write_bio_X509_CERT_PAIR            3284	EXIST::FUNCTION:
+ECDH_get_ex_data                        3285	EXIST::FUNCTION:ECDH
+ECDSA_do_sign                           3286	EXIST::FUNCTION:ECDSA
+ENGINE_unregister_ECDH                  3287	EXIST::FUNCTION:
+ECDH_OpenSSL                            3288	EXIST::FUNCTION:ECDH
+EC_POINT_dup                            3289	EXIST::FUNCTION:EC
+EC_get_builtin_curves                   3290	EXIST::FUNCTION:EC
+EVP_PKEY_set1_EC_KEY                    3291	EXIST::FUNCTION:EC
+BN_GF2m_mod_sqrt_arr                    3292	EXIST::FUNCTION:
+i2d_ECPrivateKey_bio                    3293	EXIST::FUNCTION:BIO,EC
+ECPKParameters_print_fp                 3294	EXIST::FUNCTION:EC,FP_API
+ECDSA_SIG_free                          3295	EXIST::FUNCTION:ECDSA
+PEM_write_bio_ECPKParameters            3296	EXIST::FUNCTION:EC
+EC_GROUP_set_nid                        3297	EXIST::FUNCTION:EC
+PKCS12_add_safes                        3298	EXIST::FUNCTION:
+BN_GF2m_poly2arr                        3299	EXIST::FUNCTION:
+BN_get0_nist_prime_224                  3300	EXIST::FUNCTION:
+i2d_ECParameters                        3301	EXIST::FUNCTION:EC
+i2d_ECPKParameters                      3302	EXIST::FUNCTION:EC
+BN_ncopy                                3303	EXIST::FUNCTION:
+d2i_ECPKParameters                      3304	EXIST::FUNCTION:EC
+ENGINE_set_ECDH                         3305	EXIST::FUNCTION:
+PEM_write_bio_EC_PUBKEY                 3306	EXIST::FUNCTION:EC
+ECParameters_print                      3307	EXIST::FUNCTION:BIO,EC
+ASN1_generate_nconf                     3308	EXIST::FUNCTION:
+BN_GF2m_mod_mul                         3309	EXIST::FUNCTION:
+EC_GROUP_set_seed                       3310	EXIST::FUNCTION:EC
+EC_GROUP_get_curve_GF2m                 3311	EXIST::FUNCTION:EC
+PEM_read_X509_CERT_PAIR                 3312	EXIST:!WIN16:FUNCTION:
+ECPublicKey_set_octet_string            3313	EXIST::FUNCTION:EC
+ECDSA_get_ex_data                       3314	EXIST::FUNCTION:ECDSA
+BN_GF2m_mod                             3315	EXIST::FUNCTION:
+EC_GROUP_get_seed_len                   3316	EXIST::FUNCTION:EC
+PEM_read_bio_EC_PUBKEY                  3317	EXIST::FUNCTION:EC
+i2d_EC_PUBKEY                           3318	EXIST::FUNCTION:EC
+ECDSA_get_default_method                3319	EXIST::FUNCTION:ECDSA
+ASN1_put_eoc                            3320	EXIST::FUNCTION:
+ECDSA_DATA_free                         3321	EXIST::FUNCTION:ECDSA
+EC_METHOD_get_field_type                3322	EXIST::FUNCTION:EC
+EC_GFp_nist_method                      3323	EXIST::FUNCTION:EC
+X509_CERT_PAIR_it                       3324	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+X509_CERT_PAIR_it                       3324	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+BN_GF2m_mod_sqr_arr                     3325	EXIST::FUNCTION:
+EC_GROUP_set_curve_GF2m                 3326	EXIST::FUNCTION:EC
+ENGINE_set_default_ECDSA                3327	EXIST::FUNCTION:
+BN_GF2m_mod_sqrt                        3328	EXIST::FUNCTION:
+ECDH_set_default_method                 3329	EXIST::FUNCTION:ECDH
+EC_KEY_generate_key                     3330	EXIST::FUNCTION:EC
+BN_GF2m_arr2poly                        3331	EXIST::FUNCTION:
+ECPublicKey_get_octet_string            3332	EXIST::FUNCTION:EC
+EC_GROUP_check                          3333	EXIST::FUNCTION:EC
+d2i_ECPrivateKey_bio                    3334	EXIST::FUNCTION:BIO,EC
+d2i_ECPrivateKey                        3335	EXIST::FUNCTION:EC
+ASN1_item_ndef_i2d                      3336	EXIST::FUNCTION:
+i2d_PKCS7_NDEF                          3337	EXIST::FUNCTION:
+EC_GROUP_get_degree                     3338	EXIST::FUNCTION:EC
+ASN1_generate_v3                        3339	EXIST::FUNCTION:
+BN_GF2m_add                             3340	EXIST::FUNCTION:
+X509_CERT_PAIR_free                     3341	EXIST::FUNCTION:
+BN_nist_mod_224                         3342	EXIST::FUNCTION:
+i2d_EC_PUBKEY_bio                       3343	EXIST::FUNCTION:BIO,EC
+EC_GROUP_get_asn1_flag                  3344	EXIST::FUNCTION:EC
+ECDH_get_ex_new_index                   3345	EXIST::FUNCTION:ECDH
+ECDH_size                               3346	EXIST::FUNCTION:ECDH
+BN_GF2m_mod_inv                         3347	EXIST::FUNCTION:
+BN_GF2m_mod_exp                         3348	EXIST::FUNCTION:
+EC_GROUP_get0_seed                      3349	EXIST::FUNCTION:EC
+ecdsa_check                             3350	EXIST::FUNCTION:ECDSA
+BN_GF2m_mod_div_arr                     3351	EXIST::FUNCTION:
+ENGINE_set_ECDSA                        3352	EXIST::FUNCTION:
+ECPKParameters_print                    3353	EXIST::FUNCTION:BIO,EC
+PEM_write_EC_PUBKEY                     3354	EXIST:!WIN16:FUNCTION:EC
+ECDH_set_method                         3355	EXIST::FUNCTION:ECDH
+ECDH_set_ex_data                        3356	EXIST::FUNCTION:ECDH
+BN_nist_mod_521                         3357	EXIST::FUNCTION:
+EC_GROUP_set_point_conversion_form      3358	EXIST:!VMS:FUNCTION:EC
+EC_GROUP_set_point_conv_form            3358	EXIST:VMS:FUNCTION:EC
+PEM_read_EC_PUBKEY                      3359	EXIST:!WIN16:FUNCTION:EC
+i2d_ECDSA_SIG                           3360	EXIST::FUNCTION:ECDSA
+ECDSA_OpenSSL                           3361	EXIST::FUNCTION:ECDSA
+ECDSA_set_default_method                3362	EXIST::FUNCTION:ECDSA
+EC_POINT_set_compressed_coordinates_GF2m 3363	EXIST:!VMS:FUNCTION:EC
+EC_POINT_set_compr_coords_GF2m          3363	EXIST:VMS:FUNCTION:EC
+ECDH_DATA_new_method                    3364	EXIST::FUNCTION:ECDH
+BN_get0_nist_prime_256                  3365	EXIST::FUNCTION:
+PEM_read_ECPrivateKey                   3366	EXIST:!WIN16:FUNCTION:EC
+ERR_load_ECDSA_strings                  3367	EXIST::FUNCTION:ECDSA
+EC_GROUP_get_basis_type                 3368	EXIST::FUNCTION:EC
+ECDH_DATA_new                           3369	EXIST::FUNCTION:ECDH
+BN_nist_mod_384                         3370	EXIST::FUNCTION:
+i2d_X509_CERT_PAIR                      3371	EXIST::FUNCTION:
+PEM_write_ECPKParameters                3372	EXIST:!WIN16:FUNCTION:EC
+ECDH_compute_key                        3373	EXIST::FUNCTION:ECDH
+ENGINE_register_all_ECDH                3374	EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad                  3375	EXIST::FUNCTION:
+i2d_ECPrivateKey_fp                     3376	EXIST::FUNCTION:EC,FP_API
+ENGINE_register_all_ECDSA               3377	EXIST::FUNCTION:
+EC_POINT_get_affine_coordinates_GF2m    3378	EXIST:!VMS:FUNCTION:EC
+EC_POINT_get_affine_coords_GF2m         3378	EXIST:VMS:FUNCTION:EC
+EC_GROUP_dup                            3379	EXIST::FUNCTION:EC
+ENGINE_get_default_ECDSA                3380	EXIST::FUNCTION:
+EC_KEY_new                              3381	EXIST::FUNCTION:EC
+ECDSA_verify                            3382	EXIST::FUNCTION:ECDSA
+EC_POINT_point2hex                      3383	EXIST::FUNCTION:EC
+ECDSA_do_verify                         3384	EXIST::FUNCTION:ECDSA
+d2i_ECPrivateKey_fp                     3385	EXIST::FUNCTION:EC,FP_API
+PEM_write_ECPrivateKey                  3386	EXIST:!WIN16:FUNCTION:EC
+PEM_read_ECPKParameters                 3387	EXIST:!WIN16:FUNCTION:EC
+X509_CERT_PAIR_new                      3388	EXIST::FUNCTION:
+ECParameters_print_fp                   3389	EXIST::FUNCTION:EC,FP_API
+ECDH_DATA_free                          3390	EXIST::FUNCTION:ECDH
+PEM_write_X509_CERT_PAIR                3391	EXIST:!WIN16:FUNCTION:
+d2i_X509_CERT_PAIR                      3392	EXIST::FUNCTION:
+i2d_EC_PUBKEY_fp                        3393	EXIST::FUNCTION:EC,FP_API
+BN_nist_mod_256                         3394	EXIST::FUNCTION:
+ECDSA_DATA_new                          3395	EXIST::FUNCTION:ECDSA
+ECDSA_size                              3396	EXIST::FUNCTION:ECDSA
+d2i_EC_PUBKEY_bio                       3397	EXIST::FUNCTION:BIO,EC
+BN_get0_nist_prime_521                  3398	EXIST::FUNCTION:
+PEM_read_bio_ECPrivateKey               3399	EXIST::FUNCTION:EC
+ENGINE_get_ECDH                         3400	EXIST::FUNCTION:
+d2i_ECDSA_SIG                           3401	EXIST::FUNCTION:ECDSA
+ECDSA_sign                              3402	EXIST::FUNCTION:ECDSA
+ENGINE_get_ECDSA                        3403	EXIST::FUNCTION:
+EVP_ecdsa                               3404	EXIST::FUNCTION:SHA
+PKCS12_add_cert                         3405	EXIST::FUNCTION:
+ERR_load_ECDH_strings                   3406	EXIST::FUNCTION:ECDH
+EC_KEY_dup                              3407	EXIST::FUNCTION:EC
+ECDSA_set_method                        3408	EXIST::FUNCTION:ECDSA
+d2i_ECParameters                        3409	EXIST::FUNCTION:EC
+EC_GF2m_simple_method                   3410	EXIST::FUNCTION:EC
+ECDSA_set_ex_data                       3411	EXIST::FUNCTION:ECDSA
+EC_KEY_print                            3412	EXIST::FUNCTION:BIO,EC
+ECDSA_get_ex_new_index                  3413	EXIST::FUNCTION:ECDSA
+EC_GROUP_set_asn1_flag                  3414	EXIST::FUNCTION:EC
+EC_KEY_check_key                        3415	EXIST::FUNCTION:EC
+d2i_EC_PUBKEY_fp                        3416	EXIST::FUNCTION:EC,FP_API
+ecdh_check                              3417	EXIST::FUNCTION:ECDH
+ECDSA_DATA_new_method                   3418	EXIST::FUNCTION:ECDSA
+PEM_read_bio_X509_CERT_PAIR             3419	EXIST::FUNCTION:
+ENGINE_set_default_ECDH                 3420	EXIST::FUNCTION:
+PKCS12_add_key                          3421	EXIST::FUNCTION:
+DSO_merge                               3422	EXIST::FUNCTION:
+EC_POINT_hex2point                      3423	EXIST::FUNCTION:EC
+BN_GF2m_mod_inv_arr                     3424	EXIST::FUNCTION:
+ENGINE_unregister_ECDSA                 3425	EXIST::FUNCTION: