Update from stable branch.

10 files changed, 565 insertions, 431 deletions

diff --git a/CHANGES b/CHANGES
index b49f83e8de..dc95e026ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -725,6 +725,12 @@
      [NTT]
 
  Changes between 0.9.8i and 0.9.8j  [xx XXX xxxx]
+  
+  *) Update Configure code and WIN32 build scripts to support experimental
+     code. This is surrounded by OPENSSL_EXPERIMENTAL_FOO and not compiled
+     in by default. Using the configuration option "enable-experimental-foo"
+     enables it. Use this option for JPAKE.
+     [Steve Henson]
 
   *) Add JPAKE support, including demo authentication in s_client and
      s_server.
diff --git a/Configure b/Configure
index d86a93bce7..5d8305bbf9 100755
--- a/Configure
+++ b/Configure
@@ -604,6 +604,7 @@ my $no_threads=0;
 my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
+my $jpake=1;      # but "no-jpake" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_rfc3779=1; # but "no-rfc3779" is default
 my $no_asm=0;
@@ -640,6 +641,7 @@ my $perl;
 
 my %disabled = ( # "what"         => "comment"
 		 "gmp"		  => "default",
+                 "experimental-jpake"          => "default",
                  "mdc2"           => "default",
                  "rc5"            => "default",
 		 "rfc3779"	  => "default",
@@ -920,6 +922,8 @@ foreach (sort (keys %disabled))
 		{ $no_threads = 1; }
 	elsif (/^shared$/)
 		{ $no_shared = 1; }
+	elsif (/^experimental-jpake$/)
+		{ $jpake = 0; push @skip, "jpake"}
 	elsif (/^zlib$/)
 		{ $zlib = 0; }
 	elsif (/^static-engine$/)
@@ -1161,6 +1165,11 @@ if ($threads)
 	$openssl_thread_defines .= $thread_defines;
 	}
 
+if ($jpake)
+	{
+	$openssl_other_defines = "#define OPENSSL_EXPERIMENTAL_JPAKE\n";
+	}
+
 if ($zlib)
 	{
 	$cflags = "-DZLIB $cflags";
@@ -1367,7 +1376,8 @@ while (<IN>)
 	if ($sdirs) {
 		my $dir;
 		foreach $dir (@skip) {
-			s/([ 	])$dir /\1/;
+			s/(\s)$dir /$1/;
+			s/\s$dir$//;
 			}
 		}
 	$sdirs = 0 unless /\\$/;
diff --git a/apps/apps.c b/apps/apps.c
index 7038ac1e24..455bf28e76 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -137,7 +137,9 @@
 #include <openssl/rsa.h>
 #endif
 #include <openssl/bn.h>
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 #include <openssl/jpake.h>
+#endif
 
 #define NON_MAIN
 #include "apps.h"
@@ -2379,6 +2381,8 @@ void policies_print(BIO *out, X509_STORE_CTX *ctx)
 		BIO_free(out);
 	}
 
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
+
 static JPAKE_CTX *jpake_init(const char *us, const char *them,
 							 const char *secret)
 	{
@@ -2591,6 +2595,8 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
 	BIO_free(bconn);
 	}
 
+#endif
+
 /*
  * Platform-specific sections
  */
diff --git a/apps/apps.h b/apps/apps.h
index f08893e3e8..7172edf398 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -308,8 +308,10 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
 			const char *algname, ENGINE *e, int do_param);
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
+#endif
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
diff --git a/apps/s_client.c b/apps/s_client.c
index 93c62b4386..231915160e 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -429,7 +429,9 @@ int MAIN(int argc, char **argv)
 	int peerlen = sizeof(peer);
 	int enable_timeouts = 0 ;
 	long socket_mtu = 0;
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 	char *jpake_secret = NULL;
+#endif
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 	meth=SSLv23_client_method();
@@ -699,11 +701,13 @@ int MAIN(int argc, char **argv)
 			/* meth=TLSv1_client_method(); */
 			}
 #endif
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 		else if (strcmp(*argv,"-jpake") == 0)
 			{
 			if (--argc < 1) goto bad;
 			jpake_secret = *++argv;
 			}
+#endif
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1022,9 +1026,10 @@ SSL_set_tlsext_status_ids(con, ids);
 #endif
 		}
 #endif
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 	if (jpake_secret)
 		jpake_client_auth(bio_c_out, sbio, jpake_secret);
+#endif
 
 	SSL_set_bio(con,sbio,sbio);
 	SSL_set_connect_state(con);
diff --git a/apps/s_server.c b/apps/s_server.c
index 1bf649b710..6b0d340be2 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -822,7 +822,9 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
 
 int MAIN(int, char **);
 
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 static char *jpake_secret = NULL;
+#endif
 
 int MAIN(int argc, char *argv[])
 	{
@@ -1182,11 +1184,13 @@ int MAIN(int argc, char *argv[])
 			}
 			
 #endif
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 		else if (strcmp(*argv,"-jpake") == 0)
 			{
 			if (--argc < 1) goto bad;
 			jpake_secret = *(++argv);
 			}
+#endif
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1814,9 +1818,10 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 		test=BIO_new(BIO_f_nbio_test());
 		sbio=BIO_push(test,sbio);
 		}
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 	if(jpake_secret)
 		jpake_server_auth(bio_s_out, sbio, jpake_secret);
+#endif
 
 	SSL_set_bio(con,sbio,sbio);
 	SSL_set_accept_state(con);
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 5ab89f9498..06e137e28e 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -99,8 +99,9 @@
 #ifndef OPENSSL_NO_CMS
 #include <openssl/cms.h>
 #endif
-
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 #include <openssl/jpake.h>
+#endif
 
 void ERR_load_crypto_strings(void)
 	{
@@ -150,6 +151,8 @@ void ERR_load_crypto_strings(void)
 #ifndef OPENSSL_NO_CMS
 	ERR_load_CMS_strings();
 #endif
+#ifdef OPENSSL_EXPERIMENTAL_JPAKE
 	ERR_load_JPAKE_strings();
 #endif
+#endif
 	}
diff --git a/crypto/jpake/jpake.h b/crypto/jpake/jpake.h
index becc66c334..a39a9a877f 100644
--- a/crypto/jpake/jpake.h
+++ b/crypto/jpake/jpake.h
@@ -8,6 +8,12 @@
 #ifndef HEADER_JPAKE_H
 #define HEADER_JPAKE_H
 
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_EXPERIMENTAL_JPAKE
+#error JPAKE is disabled.
+#endif
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/util/libeay.num b/util/libeay.num
index de5ee7b4ec..922f439897 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -185,7 +185,7 @@ CRYPTO_mem_leaks_fp                     192	EXIST::FUNCTION:FP_API
 CRYPTO_realloc                          193	EXIST::FUNCTION:
 CRYPTO_remalloc                         194	EXIST::FUNCTION:
 CRYPTO_set_add_lock_callback            195	EXIST::FUNCTION:
-CRYPTO_set_id_callback                  196	EXIST::FUNCTION:
+CRYPTO_set_id_callback                  196	EXIST::FUNCTION:DEPRECATED
 CRYPTO_set_locking_callback             197	EXIST::FUNCTION:
 CRYPTO_set_mem_functions                198	EXIST::FUNCTION:
 CRYPTO_thread_id                        199	EXIST::FUNCTION:DEPRECATED
@@ -343,7 +343,7 @@ NETSCAPE_SPKI_new                       350	EXIST::FUNCTION:
 NETSCAPE_SPKI_sign                      351	EXIST::FUNCTION:EVP
 NETSCAPE_SPKI_verify                    352	EXIST::FUNCTION:EVP
 OBJ_add_object                          353	EXIST::FUNCTION:
-OBJ_bsearch                             354	EXIST::FUNCTION:
+OBJ_bsearch                             354	NOEXIST::FUNCTION:
 OBJ_cleanup                             355	EXIST::FUNCTION:
 OBJ_cmp                                 356	EXIST::FUNCTION:
 OBJ_create                              357	EXIST::FUNCTION:
@@ -3176,7 +3176,7 @@ STORE_meth_get_modify_fn                3591	NOEXIST::FUNCTION:
 STORE_method_get_modify_function        3591	NOEXIST::FUNCTION:
 v2i_ASN1_BIT_STRING                     3592	EXIST::FUNCTION:
 STORE_store_certificate                 3593	NOEXIST::FUNCTION:
-OBJ_bsearch_ex                          3594	EXIST::FUNCTION:
+OBJ_bsearch_ex                          3594	NOEXIST::FUNCTION:
 X509_STORE_CTX_set_default              3595	EXIST::FUNCTION:
 STORE_ATTR_INFO_set_sha1str             3596	NOEXIST::FUNCTION:
 BN_GF2m_mod_inv                         3597	EXIST::FUNCTION:
@@ -3656,426 +3656,502 @@ ENGINE_set_load_ssl_client_cert_function 4044	EXIST::FUNCTION:ENGINE
 ENGINE_get_ssl_client_cert_function     4045	EXIST::FUNCTION:ENGINE
 ENGINE_load_ssl_client_cert             4046	EXIST::FUNCTION:ENGINE
 ENGINE_load_capi                        4047	EXIST::FUNCTION:CAPIENG,ENGINE,STATIC_ENGINE
-i2d_TS_TST_INFO                         4050	EXIST::FUNCTION:
-BN_BLINDING_set_thread                  4051	EXIST::FUNCTION:
-EVP_PKEY_asn1_find                      4052	EXIST::FUNCTION:
-DSO_METHOD_beos                         4053	EXIST::FUNCTION:
-TS_CONF_load_cert                       4054	EXIST::FUNCTION:
-TS_REQ_get_ext                          4055	EXIST::FUNCTION:
-EVP_PKEY_sign_init                      4056	EXIST::FUNCTION:
-ASN1_item_print                         4057	EXIST::FUNCTION:
-TS_TST_INFO_set_nonce                   4058	EXIST::FUNCTION:
-TS_RESP_dup                             4059	EXIST::FUNCTION:
-ENGINE_register_pkey_meths              4060	EXIST::FUNCTION:ENGINE
-EVP_PKEY_asn1_add0                      4061	EXIST::FUNCTION:
-PKCS7_add0_attrib_signing_time          4062	EXIST::FUNCTION:
-i2d_TS_TST_INFO_fp                      4063	EXIST::FUNCTION:
-BIO_asn1_get_prefix                     4064	EXIST::FUNCTION:
-TS_TST_INFO_set_time                    4065	EXIST::FUNCTION:
-EVP_PKEY_meth_set_decrypt               4066	EXIST::FUNCTION:
-EVP_PKEY_set_type_str                   4067	EXIST::FUNCTION:
-EVP_PKEY_CTX_get_keygen_info            4068	EXIST::FUNCTION:
-TS_REQ_set_policy_id                    4069	EXIST::FUNCTION:
-d2i_TS_RESP_fp                          4070	EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meth_engine        4071	EXIST:!VMS:FUNCTION:ENGINE
-ENGINE_get_pkey_asn1_meth_eng           4071	EXIST:VMS:FUNCTION:ENGINE
-WHIRLPOOL_Init                          4072	EXIST::FUNCTION:WHIRLPOOL
-TS_RESP_set_status_info                 4073	EXIST::FUNCTION:
-EVP_PKEY_keygen                         4074	EXIST::FUNCTION:
-EVP_DigestSignInit                      4075	EXIST::FUNCTION:
-TS_ACCURACY_set_millis                  4076	EXIST::FUNCTION:
-TS_REQ_dup                              4077	EXIST::FUNCTION:
-GENERAL_NAME_dup                        4078	EXIST::FUNCTION:
-ASN1_SEQUENCE_ANY_it                    4079	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_SEQUENCE_ANY_it                    4079	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-WHIRLPOOL                               4080	EXIST::FUNCTION:WHIRLPOOL
-X509_STORE_get1_crls                    4081	EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meth               4082	EXIST::FUNCTION:ENGINE
-EVP_PKEY_asn1_new                       4083	EXIST::FUNCTION:
-BIO_new_NDEF                            4084	EXIST::FUNCTION:
-ENGINE_get_pkey_meth                    4085	EXIST::FUNCTION:ENGINE
-TS_MSG_IMPRINT_set_algo                 4086	EXIST::FUNCTION:
-i2d_TS_TST_INFO_bio                     4087	EXIST::FUNCTION:
-TS_TST_INFO_set_ordering                4088	EXIST::FUNCTION:
-TS_TST_INFO_get_ext_by_OBJ              4089	EXIST::FUNCTION:
-TS_CONF_get_tsa_section                 4090	EXIST::FUNCTION:
-SMIME_write_ASN1                        4091	EXIST::FUNCTION:
-TS_RESP_CTX_set_signer_key              4092	EXIST::FUNCTION:
-EVP_PKEY_encrypt_old                    4093	EXIST::FUNCTION:
-EVP_PKEY_encrypt_init                   4094	EXIST::FUNCTION:
-CRYPTO_THREADID_cpy                     4095	EXIST::FUNCTION:
-ASN1_PCTX_get_cert_flags                4096	EXIST::FUNCTION:
-i2d_ESS_SIGNING_CERT                    4097	EXIST::FUNCTION:
-TS_CONF_load_key                        4098	EXIST::FUNCTION:
-i2d_ASN1_SEQUENCE_ANY                   4099	EXIST::FUNCTION:
-d2i_TS_MSG_IMPRINT_bio                  4100	EXIST::FUNCTION:
-EVP_PKEY_asn1_set_public                4101	EXIST::FUNCTION:
-b2i_PublicKey_bio                       4102	EXIST::FUNCTION:
-BIO_asn1_set_prefix                     4103	EXIST::FUNCTION:
-EVP_PKEY_new_mac_key                    4104	EXIST::FUNCTION:
-BIO_new_CMS                             4105	EXIST::FUNCTION:CMS
-CRYPTO_THREADID_cmp                     4106	EXIST::FUNCTION:
-TS_REQ_ext_free                         4107	EXIST::FUNCTION:
-EVP_PKEY_asn1_set_free                  4108	EXIST::FUNCTION:
-EVP_PKEY_get0_asn1                      4109	EXIST::FUNCTION:
-d2i_NETSCAPE_X509                       4110	EXIST::FUNCTION:
-EVP_PKEY_verify_recover_init            4111	EXIST::FUNCTION:
-EVP_PKEY_CTX_set_data                   4112	EXIST::FUNCTION:
-EVP_PKEY_keygen_init                    4113	EXIST::FUNCTION:
-TS_RESP_CTX_set_status_info             4114	EXIST::FUNCTION:
-TS_MSG_IMPRINT_get_algo                 4115	EXIST::FUNCTION:
-TS_REQ_print_bio                        4116	EXIST::FUNCTION:
-EVP_PKEY_CTX_ctrl_str                   4117	EXIST::FUNCTION:
-EVP_PKEY_get_default_digest_nid         4118	EXIST::FUNCTION:
-PEM_write_bio_PKCS7_stream              4119	EXIST::FUNCTION:
-TS_MSG_IMPRINT_print_bio                4120	EXIST::FUNCTION:
-BN_asc2bn                               4121	EXIST::FUNCTION:
-TS_REQ_get_policy_id                    4122	EXIST::FUNCTION:
-ENGINE_set_default_pkey_asn1_meths      4123	EXIST:!VMS:FUNCTION:ENGINE
-ENGINE_set_def_pkey_asn1_meths          4123	EXIST:VMS:FUNCTION:ENGINE
-d2i_TS_ACCURACY                         4124	EXIST::FUNCTION:
-DSO_global_lookup                       4125	EXIST::FUNCTION:
-TS_CONF_set_tsa_name                    4126	EXIST::FUNCTION:
-i2d_ASN1_SET_ANY                        4127	EXIST::FUNCTION:
-ENGINE_load_gost                        4128	EXIST::FUNCTION:ENGINE,GOST,STATIC_ENGINE
-WHIRLPOOL_BitUpdate                     4129	EXIST::FUNCTION:WHIRLPOOL
-ASN1_PCTX_get_flags                     4130	EXIST::FUNCTION:
-TS_TST_INFO_get_ext_by_NID              4131	EXIST::FUNCTION:
-TS_RESP_new                             4132	EXIST::FUNCTION:
-ESS_CERT_ID_dup                         4133	EXIST::FUNCTION:
-TS_STATUS_INFO_dup                      4134	EXIST::FUNCTION:
-TS_REQ_delete_ext                       4135	EXIST::FUNCTION:
-EVP_DigestVerifyFinal                   4136	EXIST::FUNCTION:
-EVP_PKEY_print_params                   4137	EXIST::FUNCTION:
-i2d_CMS_bio_stream                      4138	EXIST::FUNCTION:CMS
-TS_REQ_get_msg_imprint                  4139	EXIST::FUNCTION:
-OBJ_find_sigid_by_algs                  4140	EXIST::FUNCTION:
-TS_TST_INFO_get_serial                  4141	EXIST::FUNCTION:
-TS_REQ_get_nonce                        4142	EXIST::FUNCTION:
-BN_BLINDING_cmp_thread                  4143	EXIST::FUNCTION:
-X509_PUBKEY_set0_param                  4144	EXIST::FUNCTION:
-EVP_PKEY_CTX_set0_keygen_info           4145	EXIST::FUNCTION:
-i2d_ISSUING_DIST_POINT                  4146	EXIST::FUNCTION:
-ASN1_SET_ANY_it                         4147	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ASN1_SET_ANY_it                         4147	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-EVP_PKEY_CTX_get_data                   4148	EXIST::FUNCTION:
-TS_STATUS_INFO_print_bio                4149	EXIST::FUNCTION:
-EVP_PKEY_derive_init                    4150	EXIST::FUNCTION:
-d2i_TS_TST_INFO                         4151	EXIST::FUNCTION:
-EVP_PKEY_asn1_add_alias                 4152	EXIST::FUNCTION:
-d2i_TS_RESP_bio                         4153	EXIST::FUNCTION:
-OTHERNAME_cmp                           4154	EXIST::FUNCTION:
-GENERAL_NAME_set0_value                 4155	EXIST::FUNCTION:
-PKCS7_RECIP_INFO_get0_alg               4156	EXIST::FUNCTION:
-TS_RESP_CTX_new                         4157	EXIST::FUNCTION:
-TS_RESP_set_tst_info                    4158	EXIST::FUNCTION:
-PKCS7_final                             4159	EXIST::FUNCTION:
-EVP_PKEY_base_id                        4160	EXIST::FUNCTION:
-TS_RESP_CTX_set_signer_cert             4161	EXIST::FUNCTION:
-TS_REQ_set_msg_imprint                  4162	EXIST::FUNCTION:
-EVP_PKEY_CTX_ctrl                       4163	EXIST::FUNCTION:
-TS_CONF_set_digests                     4164	EXIST::FUNCTION:
-d2i_TS_MSG_IMPRINT                      4165	EXIST::FUNCTION:
-EVP_PKEY_meth_set_ctrl                  4166	EXIST::FUNCTION:
-TS_REQ_get_ext_by_NID                   4167	EXIST::FUNCTION:
-PKCS5_pbe_set0_algor                    4168	EXIST::FUNCTION:
-TS_ACCURACY_new                         4169	EXIST::FUNCTION:
-X509_CRL_METHOD_free                    4170	EXIST::FUNCTION:
-ASN1_PCTX_get_nm_flags                  4171	EXIST::FUNCTION:
-EVP_PKEY_meth_set_sign                  4172	EXIST::FUNCTION:
-EVP_PKEY_decrypt_init                   4173	EXIST::FUNCTION:
-NETSCAPE_X509_free                      4174	EXIST::FUNCTION:
-i2b_PVK_bio                             4175	EXIST::FUNCTION:
-EVP_PKEY_print_private                  4176	EXIST::FUNCTION:
-GENERAL_NAME_get0_value                 4177	EXIST::FUNCTION:
-b2i_PVK_bio                             4178	EXIST::FUNCTION:
-TS_TST_INFO_new                         4179	EXIST::FUNCTION:
-EVP_MD_do_all_sorted                    4180	EXIST::FUNCTION:
-TS_CONF_set_default_engine              4181	EXIST::FUNCTION:
-TS_ACCURACY_set_seconds                 4182	EXIST::FUNCTION:
-TS_TST_INFO_get_time                    4183	EXIST::FUNCTION:
-PKCS8_pkey_get0                         4184	EXIST::FUNCTION:
-EVP_PKEY_asn1_get0                      4185	EXIST::FUNCTION:
-OBJ_add_sigid                           4186	EXIST::FUNCTION:
-PKCS7_SIGNER_INFO_sign                  4187	EXIST::FUNCTION:
-EVP_PKEY_paramgen_init                  4188	EXIST::FUNCTION:
-EVP_PKEY_sign                           4189	EXIST::FUNCTION:
-OBJ_sigid_free                          4190	EXIST::FUNCTION:
-EVP_PKEY_meth_set_init                  4191	EXIST::FUNCTION:
-d2i_ESS_ISSUER_SERIAL                   4192	EXIST::FUNCTION:
-ISSUING_DIST_POINT_new                  4193	EXIST::FUNCTION:
-TS_OBJ_print_bio                        4194	EXIST::FUNCTION:
-EVP_PKEY_meth_set_verify_recover        4195	EXIST:!VMS:FUNCTION:
-EVP_PKEY_meth_set_vrfy_recover          4195	EXIST:VMS:FUNCTION:
-TS_RESP_get_status_info                 4196	EXIST::FUNCTION:
-CMS_stream                              4197	EXIST::FUNCTION:CMS
-EVP_PKEY_CTX_set_cb                     4198	EXIST::FUNCTION:
-PKCS7_to_TS_TST_INFO                    4199	EXIST::FUNCTION:
-ASN1_PCTX_get_oid_flags                 4200	EXIST::FUNCTION:
-TS_TST_INFO_add_ext                     4201	EXIST::FUNCTION:
-EVP_PKEY_meth_set_derive                4202	EXIST::FUNCTION:
-i2d_TS_RESP_fp                          4203	EXIST::FUNCTION:
-i2d_TS_MSG_IMPRINT_bio                  4204	EXIST::FUNCTION:
-TS_RESP_CTX_set_accuracy                4205	EXIST::FUNCTION:
-TS_REQ_set_nonce                        4206	EXIST::FUNCTION:
-ESS_CERT_ID_new                         4207	EXIST::FUNCTION:
-ENGINE_pkey_asn1_find_str               4208	EXIST::FUNCTION:ENGINE
-TS_REQ_get_ext_count                    4209	EXIST::FUNCTION:
-BUF_reverse                             4210	EXIST::FUNCTION:
-TS_TST_INFO_print_bio                   4211	EXIST::FUNCTION:
-d2i_ISSUING_DIST_POINT                  4212	EXIST::FUNCTION:
-ENGINE_get_pkey_meths                   4213	EXIST::FUNCTION:ENGINE
-i2b_PrivateKey_bio                      4214	EXIST::FUNCTION:
-i2d_TS_RESP                             4215	EXIST::FUNCTION:
-b2i_PublicKey                           4216	EXIST::FUNCTION:
-TS_VERIFY_CTX_cleanup                   4217	EXIST::FUNCTION:
-TS_STATUS_INFO_free                     4218	EXIST::FUNCTION:
-TS_RESP_verify_token                    4219	EXIST::FUNCTION:
-ASN1_bn_print                           4220	EXIST::FUNCTION:BIO
-EVP_PKEY_asn1_get_count                 4221	EXIST::FUNCTION:
-ENGINE_register_pkey_asn1_meths         4222	EXIST::FUNCTION:ENGINE
-ASN1_PCTX_set_nm_flags                  4223	EXIST::FUNCTION:
-EVP_DigestVerifyInit                    4224	EXIST::FUNCTION:
-ENGINE_set_default_pkey_meths           4225	EXIST::FUNCTION:ENGINE
-TS_TST_INFO_get_policy_id               4226	EXIST::FUNCTION:
-TS_REQ_get_cert_req                     4227	EXIST::FUNCTION:
-X509_CRL_set_meth_data                  4228	EXIST::FUNCTION:
-PKCS8_pkey_set0                         4229	EXIST::FUNCTION:
-ASN1_STRING_copy                        4230	EXIST::FUNCTION:
-d2i_TS_TST_INFO_fp                      4231	EXIST::FUNCTION:
-X509_CRL_match                          4232	EXIST::FUNCTION:
-EVP_PKEY_asn1_set_private               4233	EXIST::FUNCTION:
-TS_TST_INFO_get_ext_d2i                 4234	EXIST::FUNCTION:
-TS_RESP_CTX_add_policy                  4235	EXIST::FUNCTION:
-d2i_TS_RESP                             4236	EXIST::FUNCTION:
-TS_CONF_load_certs                      4237	EXIST::FUNCTION:
-TS_TST_INFO_get_msg_imprint             4238	EXIST::FUNCTION:
-ERR_load_TS_strings                     4239	EXIST::FUNCTION:
-TS_TST_INFO_get_version                 4240	EXIST::FUNCTION:
-EVP_PKEY_CTX_dup                        4241	EXIST::FUNCTION:
-EVP_PKEY_meth_set_verify                4242	EXIST::FUNCTION:
-i2b_PublicKey_bio                       4243	EXIST::FUNCTION:
-TS_CONF_set_certs                       4244	EXIST::FUNCTION:
-EVP_PKEY_asn1_get0_info                 4245	EXIST::FUNCTION:
-TS_VERIFY_CTX_free                      4246	EXIST::FUNCTION:
-TS_REQ_get_ext_by_critical              4247	EXIST::FUNCTION:
-TS_RESP_CTX_set_serial_cb               4248	EXIST::FUNCTION:
-X509_CRL_get_meth_data                  4249	EXIST::FUNCTION:
-TS_RESP_CTX_set_time_cb                 4250	EXIST::FUNCTION:
-TS_MSG_IMPRINT_get_msg                  4251	EXIST::FUNCTION:
-TS_TST_INFO_ext_free                    4252	EXIST::FUNCTION:
-TS_REQ_get_version                      4253	EXIST::FUNCTION:
-TS_REQ_add_ext                          4254	EXIST::FUNCTION:
-EVP_PKEY_CTX_set_app_data               4255	EXIST::FUNCTION:
-EVP_PKEY_meth_set_verifyctx             4256	EXIST::FUNCTION:
-i2d_PKCS7_bio_stream                    4257	EXIST::FUNCTION:
-PKCS7_sign_add_signer                   4258	EXIST::FUNCTION:
-d2i_TS_TST_INFO_bio                     4259	EXIST::FUNCTION:
-TS_TST_INFO_get_ordering                4260	EXIST::FUNCTION:
-TS_RESP_print_bio                       4261	EXIST::FUNCTION:
-TS_TST_INFO_get_exts                    4262	EXIST::FUNCTION:
-HMAC_CTX_copy                           4263	EXIST::FUNCTION:HMAC
-PKCS5_pbe2_set_iv                       4264	EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meths              4265	EXIST::FUNCTION:ENGINE
-b2i_PrivateKey                          4266	EXIST::FUNCTION:
-EVP_PKEY_CTX_get_app_data               4267	EXIST::FUNCTION:
-TS_REQ_set_cert_req                     4268	EXIST::FUNCTION:
-TS_CONF_set_serial                      4269	EXIST::FUNCTION:
-TS_TST_INFO_free                        4270	EXIST::FUNCTION:
-d2i_TS_REQ_fp                           4271	EXIST::FUNCTION:
-TS_RESP_verify_response                 4272	EXIST::FUNCTION:
-i2d_ESS_ISSUER_SERIAL                   4273	EXIST::FUNCTION:
-TS_ACCURACY_get_seconds                 4274	EXIST::FUNCTION:
-EVP_CIPHER_do_all                       4275	EXIST::FUNCTION:
-b2i_PrivateKey_bio                      4276	EXIST::FUNCTION:
-OCSP_CERTID_dup                         4277	EXIST::FUNCTION:
-X509_PUBKEY_get0_param                  4278	EXIST::FUNCTION:
-TS_MSG_IMPRINT_dup                      4279	EXIST::FUNCTION:
-PKCS7_print_ctx                         4280	EXIST::FUNCTION:
-i2d_TS_REQ_bio                          4281	EXIST::FUNCTION:
-EVP_whirlpool                           4282	EXIST::FUNCTION:WHIRLPOOL
-EVP_PKEY_asn1_set_param                 4283	EXIST::FUNCTION:
-EVP_PKEY_meth_set_encrypt               4284	EXIST::FUNCTION:
-ASN1_PCTX_set_flags                     4285	EXIST::FUNCTION:
-i2d_ESS_CERT_ID                         4286	EXIST::FUNCTION:
-TS_VERIFY_CTX_new                       4287	EXIST::FUNCTION:
-TS_RESP_CTX_set_extension_cb            4288	EXIST::FUNCTION:
-ENGINE_register_all_pkey_meths          4289	EXIST::FUNCTION:ENGINE
-TS_RESP_CTX_set_status_info_cond        4290	EXIST:!VMS:FUNCTION:
-TS_RESP_CTX_set_stat_info_cond          4290	EXIST:VMS:FUNCTION:
-EVP_PKEY_verify                         4291	EXIST::FUNCTION:
-WHIRLPOOL_Final                         4292	EXIST::FUNCTION:WHIRLPOOL
-X509_CRL_METHOD_new                     4293	EXIST::FUNCTION:
-EVP_DigestSignFinal                     4294	EXIST::FUNCTION:
-TS_RESP_CTX_set_def_policy              4295	EXIST::FUNCTION:
-NETSCAPE_X509_it                        4296	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-NETSCAPE_X509_it                        4296	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-TS_RESP_create_response                 4297	EXIST::FUNCTION:
-PKCS7_SIGNER_INFO_get0_algs             4298	EXIST::FUNCTION:
-TS_TST_INFO_get_nonce                   4299	EXIST::FUNCTION:
-EVP_PKEY_decrypt_old                    4300	EXIST::FUNCTION:
-TS_TST_INFO_set_policy_id               4301	EXIST::FUNCTION:
-TS_CONF_set_ess_cert_id_chain           4302	EXIST::FUNCTION:
-EVP_PKEY_CTX_get0_pkey                  4303	EXIST::FUNCTION:
-d2i_TS_REQ                              4304	EXIST::FUNCTION:
-EVP_PKEY_asn1_find_str                  4305	EXIST::FUNCTION:
-CRYPTO_set_idptr_callback               4306	EXIST::FUNCTION:
-BIO_f_asn1                              4307	EXIST::FUNCTION:
-ESS_SIGNING_CERT_new                    4308	EXIST::FUNCTION:
-EVP_PBE_find                            4309	EXIST::FUNCTION:
-EVP_PKEY_derive                         4310	EXIST::FUNCTION:
-i2d_TS_REQ                              4311	EXIST::FUNCTION:
-TS_TST_INFO_delete_ext                  4312	EXIST::FUNCTION:
-ESS_ISSUER_SERIAL_free                  4313	EXIST::FUNCTION:
-ASN1_PCTX_set_str_flags                 4314	EXIST::FUNCTION:
-ENGINE_get_pkey_asn1_meth_str           4315	EXIST::FUNCTION:ENGINE
-TS_CONF_set_signer_key                  4316	EXIST::FUNCTION:
-TS_ACCURACY_get_millis                  4317	EXIST::FUNCTION:
-TS_RESP_get_token                       4318	EXIST::FUNCTION:
-TS_ACCURACY_dup                         4319	EXIST::FUNCTION:
-ENGINE_register_all_pkey_asn1_meths     4320	EXIST:!VMS:FUNCTION:ENGINE
-ENGINE_reg_all_pkey_asn1_meths          4320	EXIST:VMS:FUNCTION:ENGINE
-X509_CRL_set_default_method             4321	EXIST::FUNCTION:
-CRYPTO_THREADID_hash                    4322	EXIST::FUNCTION:
-CMS_ContentInfo_print_ctx               4323	EXIST::FUNCTION:CMS
-TS_RESP_free                            4324	EXIST::FUNCTION:
-ISSUING_DIST_POINT_free                 4325	EXIST::FUNCTION:
-ESS_ISSUER_SERIAL_new                   4326	EXIST::FUNCTION:
-PKCS7_add1_attrib_digest                4327	EXIST::FUNCTION:
-TS_RESP_CTX_add_md                      4328	EXIST::FUNCTION:
-TS_TST_INFO_dup                         4329	EXIST::FUNCTION:
-ENGINE_set_pkey_asn1_meths              4330	EXIST::FUNCTION:ENGINE
-PEM_write_bio_Parameters                4331	EXIST::FUNCTION:
-TS_TST_INFO_get_accuracy                4332	EXIST::FUNCTION:
-CRYPTO_THREADID_set                     4333	EXIST::FUNCTION:
-X509_CRL_get0_by_serial                 4334	EXIST::FUNCTION:
-TS_TST_INFO_set_version                 4335	EXIST::FUNCTION:
-TS_RESP_CTX_get_tst_info                4336	EXIST::FUNCTION:
-TS_RESP_verify_signature                4337	EXIST::FUNCTION:
-TS_TST_INFO_get_tsa                     4338	EXIST::FUNCTION:
-TS_STATUS_INFO_new                      4339	EXIST::FUNCTION:
-EVP_PKEY_CTX_get_cb                     4340	EXIST::FUNCTION:
-TS_REQ_get_ext_d2i                      4341	EXIST::FUNCTION:
-GENERAL_NAME_set0_othername             4342	EXIST::FUNCTION:
-TS_TST_INFO_get_ext_count               4343	EXIST::FUNCTION:
-TS_RESP_CTX_get_request                 4344	EXIST::FUNCTION:
-i2d_NETSCAPE_X509                       4345	EXIST::FUNCTION:
-ENGINE_get_pkey_meth_engine             4346	EXIST::FUNCTION:ENGINE
-EVP_PKEY_meth_set_signctx               4347	EXIST::FUNCTION:
-EVP_PKEY_asn1_copy                      4348	EXIST::FUNCTION:
-ASN1_TYPE_cmp                           4349	EXIST::FUNCTION:
-EVP_CIPHER_do_all_sorted                4350	EXIST::FUNCTION:
-EVP_PKEY_CTX_free                       4351	EXIST::FUNCTION:
-ISSUING_DIST_POINT_it                   4352	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
-ISSUING_DIST_POINT_it                   4352	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-d2i_TS_MSG_IMPRINT_fp                   4353	EXIST::FUNCTION:
-X509_STORE_get1_certs                   4354	EXIST::FUNCTION:
-EVP_PKEY_CTX_get_operation              4355	EXIST::FUNCTION:
-d2i_ESS_SIGNING_CERT                    4356	EXIST::FUNCTION:
-TS_CONF_set_ordering                    4357	EXIST::FUNCTION:
-EVP_PBE_alg_add_type                    4358	EXIST::FUNCTION:
-TS_REQ_set_version                      4359	EXIST::FUNCTION:
-EVP_PKEY_get0                           4360	EXIST::FUNCTION:
-BIO_asn1_set_suffix                     4361	EXIST::FUNCTION:
-i2d_TS_STATUS_INFO                      4362	EXIST::FUNCTION:
-EVP_MD_do_all                           4363	EXIST::FUNCTION:
-TS_TST_INFO_set_accuracy                4364	EXIST::FUNCTION:
-PKCS7_add_attrib_content_type           4365	EXIST::FUNCTION:
-ERR_remove_thread_state                 4366	EXIST::FUNCTION:
-EVP_PKEY_meth_add0                      4367	EXIST::FUNCTION:
-TS_TST_INFO_set_tsa                     4368	EXIST::FUNCTION:
-EVP_PKEY_meth_new                       4369	EXIST::FUNCTION:
-WHIRLPOOL_Update                        4370	EXIST::FUNCTION:WHIRLPOOL
-TS_CONF_set_accuracy                    4371	EXIST::FUNCTION:
-ASN1_PCTX_set_oid_flags                 4372	EXIST::FUNCTION:
-ESS_SIGNING_CERT_dup                    4373	EXIST::FUNCTION:
-d2i_TS_REQ_bio                          4374	EXIST::FUNCTION:
-TS_RESP_CTX_add_flags                   4375	EXIST::FUNCTION:
-d2i_TS_STATUS_INFO                      4376	EXIST::FUNCTION:
-TS_MSG_IMPRINT_set_msg                  4377	EXIST::FUNCTION:
-BIO_asn1_get_suffix                     4378	EXIST::FUNCTION:
-TS_REQ_free                             4379	EXIST::FUNCTION:
-EVP_PKEY_meth_free                      4380	EXIST::FUNCTION:
-TS_REQ_get_exts                         4381	EXIST::FUNCTION:
-TS_RESP_CTX_set_clock_precision_digits  4382	EXIST:!VMS:FUNCTION:
-TS_RESP_CTX_set_clk_prec_digits         4382	EXIST:VMS:FUNCTION:
-TS_RESP_CTX_add_failure_info            4383	EXIST::FUNCTION:
-i2d_TS_RESP_bio                         4384	EXIST::FUNCTION:
-EVP_PKEY_CTX_get0_peerkey               4385	EXIST::FUNCTION:
-PEM_write_bio_CMS_stream                4386	EXIST::FUNCTION:CMS
-TS_REQ_new                              4387	EXIST::FUNCTION:
-TS_MSG_IMPRINT_new                      4388	EXIST::FUNCTION:
-EVP_PKEY_meth_find                      4389	EXIST::FUNCTION:
-EVP_PKEY_id                             4390	EXIST::FUNCTION:
-TS_TST_INFO_set_serial                  4391	EXIST::FUNCTION:
-a2i_GENERAL_NAME                        4392	EXIST::FUNCTION:
-TS_CONF_set_crypto_device               4393	EXIST::FUNCTION:
-EVP_PKEY_verify_init                    4394	EXIST::FUNCTION:
-TS_CONF_set_policies                    4395	EXIST::FUNCTION:
-ASN1_PCTX_new                           4396	EXIST::FUNCTION:
-ESS_CERT_ID_free                        4397	EXIST::FUNCTION:
-ENGINE_unregister_pkey_meths            4398	EXIST::FUNCTION:ENGINE
-TS_MSG_IMPRINT_free                     4399	EXIST::FUNCTION:
-TS_VERIFY_CTX_init                      4400	EXIST::FUNCTION:
-PKCS7_stream                            4401	EXIST::FUNCTION:
-TS_RESP_CTX_set_certs                   4402	EXIST::FUNCTION:
-TS_CONF_set_def_policy                  4403	EXIST::FUNCTION:
-NETSCAPE_X509_new                       4404	EXIST::FUNCTION:
-TS_ACCURACY_free                        4405	EXIST::FUNCTION:
-TS_RESP_get_tst_info                    4406	EXIST::FUNCTION:
-EVP_PKEY_derive_set_peer                4407	EXIST::FUNCTION:
-PEM_read_bio_Parameters                 4408	EXIST::FUNCTION:
-TS_CONF_set_clock_precision_digits      4409	EXIST:!VMS:FUNCTION:
-TS_CONF_set_clk_prec_digits             4409	EXIST:VMS:FUNCTION:
-ESS_ISSUER_SERIAL_dup                   4410	EXIST::FUNCTION:
-TS_ACCURACY_get_micros                  4411	EXIST::FUNCTION:
-ASN1_PCTX_get_str_flags                 4412	EXIST::FUNCTION:
-ASN1_BIT_STRING_check                   4413	EXIST::FUNCTION:
-X509_check_akid                         4414	EXIST::FUNCTION:
-ENGINE_unregister_pkey_asn1_meths       4415	EXIST:!VMS:FUNCTION:ENGINE
-ENGINE_unreg_pkey_asn1_meths            4415	EXIST:VMS:FUNCTION:ENGINE
-ASN1_PCTX_free                          4416	EXIST::FUNCTION:
-PEM_write_bio_ASN1_stream               4417	EXIST::FUNCTION:
-i2d_ASN1_bio_stream                     4418	EXIST::FUNCTION:
-TS_X509_ALGOR_print_bio                 4419	EXIST::FUNCTION:
-EVP_PKEY_meth_set_cleanup               4420	EXIST::FUNCTION:
-EVP_PKEY_asn1_free                      4421	EXIST::FUNCTION:
-ESS_SIGNING_CERT_free                   4422	EXIST::FUNCTION:
-TS_TST_INFO_set_msg_imprint             4423	EXIST::FUNCTION:
-GENERAL_NAME_cmp                        4424	EXIST::FUNCTION:
-d2i_ASN1_SET_ANY                        4425	EXIST::FUNCTION:
-ENGINE_set_pkey_meths                   4426	EXIST::FUNCTION:ENGINE
-i2d_TS_REQ_fp                           4427	EXIST::FUNCTION:
-d2i_ASN1_SEQUENCE_ANY                   4428	EXIST::FUNCTION:
-GENERAL_NAME_get0_otherName             4429	EXIST::FUNCTION:
-d2i_ESS_CERT_ID                         4430	EXIST::FUNCTION:
-OBJ_find_sigid_algs                     4431	EXIST::FUNCTION:
-EVP_PKEY_meth_set_keygen                4432	EXIST::FUNCTION:
-PKCS5_PBKDF2_HMAC                       4433	EXIST::FUNCTION:
-EVP_PKEY_paramgen                       4434	EXIST::FUNCTION:
-EVP_PKEY_meth_set_paramgen              4435	EXIST::FUNCTION:
-BIO_new_PKCS7                           4436	EXIST::FUNCTION:
-EVP_PKEY_verify_recover                 4437	EXIST::FUNCTION:
-TS_ext_print_bio                        4438	EXIST::FUNCTION:
-TS_ASN1_INTEGER_print_bio               4439	EXIST::FUNCTION:
-check_defer                             4440	EXIST::FUNCTION:
-DSO_pathbyaddr                          4441	EXIST::FUNCTION:
-EVP_PKEY_set_type                       4442	EXIST::FUNCTION:
-TS_ACCURACY_set_micros                  4443	EXIST::FUNCTION:
-TS_REQ_to_TS_VERIFY_CTX                 4444	EXIST::FUNCTION:
-EVP_PKEY_meth_set_copy                  4445	EXIST::FUNCTION:
-ASN1_PCTX_set_cert_flags                4446	EXIST::FUNCTION:
-TS_TST_INFO_get_ext                     4447	EXIST::FUNCTION:
-EVP_PKEY_asn1_set_ctrl                  4448	EXIST::FUNCTION:
-TS_TST_INFO_get_ext_by_critical         4449	EXIST::FUNCTION:
-EVP_PKEY_CTX_new_id                     4450	EXIST::FUNCTION:
-TS_REQ_get_ext_by_OBJ                   4451	EXIST::FUNCTION:
-TS_CONF_set_signer_cert                 4452	EXIST::FUNCTION:
-CMS_add1_crl                            4453	EXIST::FUNCTION:CMS
-TS_RESP_CTX_free                        4454	EXIST::FUNCTION:
-i2d_TS_ACCURACY                         4455	EXIST::FUNCTION:
-i2d_TS_MSG_IMPRINT_fp                   4456	EXIST::FUNCTION:
-i2d_TS_MSG_IMPRINT                      4457	EXIST::FUNCTION:
-OPENSSL_isservice                       4458	EXIST:WIN32:FUNCTION:
-EVP_PKEY_print_public                   4459	EXIST::FUNCTION:
-EVP_PKEY_CTX_new                        4460	EXIST::FUNCTION:
+OPENSSL_isservice                       4048	NOEXIST::FUNCTION:
+FIPS_dsa_sig_decode                     4049	NOEXIST::FUNCTION:
+EVP_CIPHER_CTX_clear_flags              4050	NOEXIST::FUNCTION:
+FIPS_rand_status                        4051	NOEXIST::FUNCTION:
+FIPS_rand_set_key                       4052	NOEXIST::FUNCTION:
+CRYPTO_set_mem_info_functions           4053	NOEXIST::FUNCTION:
+RSA_X931_generate_key_ex                4054	NOEXIST::FUNCTION:
+int_ERR_set_state_func                  4055	NOEXIST::FUNCTION:
+int_EVP_MD_set_engine_callbacks         4056	NOEXIST::FUNCTION:
+int_CRYPTO_set_do_dynlock_callback      4057	NOEXIST::FUNCTION:
+FIPS_rng_stick                          4058	NOEXIST::FUNCTION:
+EVP_CIPHER_CTX_set_flags                4059	NOEXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060	NOEXIST::FUNCTION:
+FIPS_selftest_check                     4061	NOEXIST::FUNCTION:
+FIPS_rand_set_dt                        4062	NOEXIST::FUNCTION:
+CRYPTO_dbg_pop_info                     4063	NOEXIST::FUNCTION:
+FIPS_dsa_free                           4064	NOEXIST::FUNCTION:
+RSA_X931_derive_ex                      4065	NOEXIST::FUNCTION:
+FIPS_rsa_new                            4066	NOEXIST::FUNCTION:
+FIPS_rand_bytes                         4067	NOEXIST::F