]> code.ossystems Code Review - meta-freescale.git/commitdiff
openssl-qoriq: upgrade to 1.0.2k
authorChunrong Guo <chunrong.guo@nxp.com>
Tue, 18 Apr 2017 04:18:44 +0000 (12:18 +0800)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 2 May 2017 20:54:58 +0000 (17:54 -0300)
Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
69 files changed:
recipes-connectivity/openssl/openssl-qoriq.inc
recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2178.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/configure-musl-target.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/crypto_use_bigint_in_x86-64_perl.patch
recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/ca.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/man-dir.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/man-section.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/no-symbolic.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/pic.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian/version-script.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/debian1.0.2/version-script.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch
recipes-connectivity/openssl/openssl-qoriq/no-rpath.patch [moved from recipes-connectivity/openssl/openssl-qoriq/debian/no-rpath.patch with 100% similarity]
recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/openssl-c_rehash.sh [deleted file]
recipes-connectivity/openssl/openssl-qoriq/openssl_fix_for_x32.patch
recipes-connectivity/openssl/openssl-qoriq/parallel.patch [deleted file]
recipes-connectivity/openssl/openssl-qoriq/qoriq/0001-remove-double-initialization-of-cryptodev-engine.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0003-cryptodev-fix-algorithm-registration.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0004-ECC-Support-header-for-Cryptodev-Engine.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0005-Initial-support-for-PKC-in-cryptodev-engine.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0006-Added-hwrng-dev-file-as-source-of-RNG.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0007-Asynchronous-interface-added-for-PKC-cryptodev-inter.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0008-Add-RSA-keygen-operation-and-support-gendsa-command-.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0009-RSA-Keygen-Fix.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0010-Removed-local-copy-of-curve_t-type.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0011-Modulus-parameter-is-not-populated-by-dhparams.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0012-SW-Backoff-mechanism-for-dsa-keygen.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0013-Fixed-DH-keygen-pair-generator.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0014-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0015-eng_cryptodev-extend-TLS-offload-with-3des_cbc_hmac_.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0016-eng_cryptodev-add-support-for-TLSv1.1-record-offload.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0017-eng_cryptodev-add-support-for-TLSv1.2-record-offload.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0018-cryptodev-drop-redundant-function.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0019-cryptodev-do-not-zero-the-buffer-before-use.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0020-cryptodev-clean-up-code-layout.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0021-cryptodev-do-not-cache-file-descriptor-in-open.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0022-cryptodev-put_dev_crypto-should-be-an-int.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0023-cryptodev-simplify-cryptodev-pkc-support-code.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0024-cryptodev-clarify-code-remove-assignments-from-condi.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0025-cryptodev-clean-up-context-state-before-anything-els.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0026-cryptodev-remove-code-duplication-in-digest-operatio.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0027-cryptodev-put-all-digest-ioctls-into-a-single-functi.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0028-cryptodev-fix-debug-print-messages.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0029-cryptodev-use-CIOCHASH-ioctl-for-digest-operations.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0030-cryptodev-reduce-duplicated-efforts-for-searching-in.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0031-cryptodev-remove-not-used-local-variables.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0032-cryptodev-hide-not-used-variable-behind-ifndef.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0033-cryptodev-fix-function-declaration-typo.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0034-cryptodev-fix-incorrect-function-signature.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0035-cryptodev-fix-warnings-on-excess-elements-in-struct-.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0036-cryptodev-fix-free-on-error-path.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0037-cryptodev-fix-return-value-on-error.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0038-cryptodev-match-types-with-cryptodev.h.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0039-cryptodev-explicitly-discard-const-qualifier.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0040-cryptodev-replace-caddr_t-with-void.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0041-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0042-cryptodev-check-for-errors-inside-cryptodev_rsa_mod_.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0043-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0044-cryptodev-check-for-errors-inside-cryptodev_dh_compu.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0045-cryptodev-change-signature-for-conversion-functions.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0046-cryptodev-add-explicit-cast-for-known-BIGNUM-values.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0047-cryptodev-treat-all-build-warnings-as-errors.patch
recipes-connectivity/openssl/openssl-qoriq/qoriq/0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch
recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb [moved from recipes-connectivity/openssl/openssl-qoriq_1.0.2h.bb with 82% similarity]

index e3b0e0f91ec3330f9e2e2af7ca711a042ce7c1ab..965291c5ead075e295de258a2d13c48141bb9eed 100644 (file)
@@ -47,8 +47,9 @@ PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-conf"
 FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl${SOLIBS}"
 FILES_${PN} =+ " ${libdir}/ssl/*"
-FILES_${PN}-misc = "${libdir}/ssl/misc"
+FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
 RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
+FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
 
 # Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
 # package RRECOMMENDS on this package.  This will enable the configuration
@@ -180,18 +181,26 @@ do_install () {
        oe_libinstall -so libcrypto ${D}${libdir}
        oe_libinstall -so libssl ${D}${libdir}
 
+        # Moving libcrypto to /lib
+        if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+                mkdir -p ${D}/${base_libdir}/
+                mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
+                sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
+        fi
+
        install -d ${D}${includedir}
        cp --dereference -R include/openssl ${D}${includedir}
 
-       install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
-       sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
-
        oe_multilib_header openssl/opensslconf.h
        if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
+                install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
+                sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
                sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
                sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
-       else
-               rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
+        # The c_rehash utility isn't installed by the normal installation process.
+        else
+                rm -f ${D}${bindir}/c_rehash
+                rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
        fi
 
        # Create SSL structure
@@ -210,7 +219,7 @@ do_install_ptest () {
        cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
        cp Configure config e_os.h ${D}${PTEST_PATH}
        cp -r -L include ${D}${PTEST_PATH}
-       ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH}
+       ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH}
        ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH}
        mkdir -p ${D}${PTEST_PATH}/crypto
        cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto
diff --git a/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch b/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch
deleted file mode 100644 (file)
index df36d5f..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-From a004e72b95835136d3f1ea90517f706c24c03da7 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Thu, 5 May 2016 11:10:26 +0100
-Subject: [PATCH] Avoid some undefined pointer arithmetic
-
-A common idiom in the codebase is:
-
-if (p + len > limit)
-{
-    return; /* Too long */
-}
-
-Where "p" points to some malloc'd data of SIZE bytes and
-limit == p + SIZE
-
-"len" here could be from some externally supplied data (e.g. from a TLS
-message).
-
-The rules of C pointer arithmetic are such that "p + len" is only well
-defined where len <= SIZE. Therefore the above idiom is actually
-undefined behaviour.
-
-For example this could cause problems if some malloc implementation
-provides an address for "p" such that "p + len" actually overflows for
-values of len that are too big and therefore p + len < limit!
-
-Issue reported by Guido Vranken.
-
-CVE-2016-2177
-
-Reviewed-by: Rich Salz <rsalz@openssl.org>
-
-Upstream-Status: Backport
-CVE: CVE-2016-2177
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-
----
- ssl/s3_srvr.c  | 14 +++++++-------
- ssl/ssl_sess.c |  2 +-
- ssl/t1_lib.c   | 56 ++++++++++++++++++++++++++++++--------------------------
- 3 files changed, 38 insertions(+), 34 deletions(-)
-
-diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
-index ab28702..ab7f690 100644
---- a/ssl/s3_srvr.c
-+++ b/ssl/s3_srvr.c
-@@ -980,7 +980,7 @@ int ssl3_get_client_hello(SSL *s)
-         session_length = *(p + SSL3_RANDOM_SIZE);
--        if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) {
-+        if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) {
-             al = SSL_AD_DECODE_ERROR;
-             SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
-             goto f_err;
-@@ -998,7 +998,7 @@ int ssl3_get_client_hello(SSL *s)
-     /* get the session-id */
-     j = *(p++);
--    if (p + j > d + n) {
-+    if ((d + n) - p < j) {
-         al = SSL_AD_DECODE_ERROR;
-         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
-         goto f_err;
-@@ -1054,14 +1054,14 @@ int ssl3_get_client_hello(SSL *s)
-     if (SSL_IS_DTLS(s)) {
-         /* cookie stuff */
--        if (p + 1 > d + n) {
-+        if ((d + n) - p < 1) {
-             al = SSL_AD_DECODE_ERROR;
-             SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
-             goto f_err;
-         }
-         cookie_len = *(p++);
--        if (p + cookie_len > d + n) {
-+        if ((d + n ) - p < cookie_len) {
-             al = SSL_AD_DECODE_ERROR;
-             SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
-             goto f_err;
-@@ -1131,7 +1131,7 @@ int ssl3_get_client_hello(SSL *s)
-         }
-     }
--    if (p + 2 > d + n) {
-+    if ((d + n ) - p < 2) {
-         al = SSL_AD_DECODE_ERROR;
-         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
-         goto f_err;
-@@ -1145,7 +1145,7 @@ int ssl3_get_client_hello(SSL *s)
-     }
-     /* i bytes of cipher data + 1 byte for compression length later */
--    if ((p + i + 1) > (d + n)) {
-+    if ((d + n) - p < i + 1) {
-         /* not enough data */
-         al = SSL_AD_DECODE_ERROR;
-         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
-@@ -1211,7 +1211,7 @@ int ssl3_get_client_hello(SSL *s)
-     /* compression */
-     i = *(p++);
--    if ((p + i) > (d + n)) {
-+    if ((d + n) - p < i) {
-         /* not enough data */
-         al = SSL_AD_DECODE_ERROR;
-         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
-diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
-index b182998..54ee783 100644
---- a/ssl/ssl_sess.c
-+++ b/ssl/ssl_sess.c
-@@ -573,7 +573,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
-     int r;
- #endif
--    if (session_id + len > limit) {
-+    if (limit - session_id < len) {
-         fatal = 1;
-         goto err;
-     }
-diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
-index fb64607..cdac011 100644
---- a/ssl/t1_lib.c
-+++ b/ssl/t1_lib.c
-@@ -1867,11 +1867,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
-         0x02, 0x03,             /* SHA-1/ECDSA */
-     };
--    if (data >= (limit - 2))
-+    if (limit - data <= 2)
-         return;
-     data += 2;
--    if (data > (limit - 4))
-+    if (limit - data < 4)
-         return;
-     n2s(data, type);
-     n2s(data, size);
-@@ -1879,7 +1879,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
-     if (type != TLSEXT_TYPE_server_name)
-         return;
--    if (data + size > limit)
-+    if (limit - data < size)
-         return;
-     data += size;
-@@ -1887,7 +1887,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
-         const size_t len1 = sizeof(kSafariExtensionsBlock);
-         const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock);
--        if (data + len1 + len2 != limit)
-+        if (limit - data != (int)(len1 + len2))
-             return;
-         if (memcmp(data, kSafariExtensionsBlock, len1) != 0)
-             return;
-@@ -1896,7 +1896,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data,
-     } else {
-         const size_t len = sizeof(kSafariExtensionsBlock);
--        if (data + len != limit)
-+        if (limit - data != (int)(len))
-             return;
-         if (memcmp(data, kSafariExtensionsBlock, len) != 0)
-             return;
-@@ -2053,19 +2053,19 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
-     if (data == limit)
-         goto ri_check;
--    if (data > (limit - 2))
-+    if (limit - data < 2)
-         goto err;
-     n2s(data, len);
--    if (data + len != limit)
-+    if (limit - data != len)
-         goto err;
--    while (data <= (limit - 4)) {
-+    while (limit - data >= 4) {
-         n2s(data, type);
-         n2s(data, size);
--        if (data + size > (limit))
-+        if (limit - data < size)
-             goto err;
- # if 0
-         fprintf(stderr, "Received extension type %d size %d\n", type, size);
-@@ -2472,18 +2472,18 @@ static int ssl_scan_clienthello_custom_tlsext(SSL *s,
-     if (s->hit || s->cert->srv_ext.meths_count == 0)
-         return 1;
--    if (data >= limit - 2)
-+    if (limit - data <= 2)
-         return 1;
-     n2s(data, len);
--    if (data > limit - len)
-+    if (limit - data < len)
-         return 1;
--    while (data <= limit - 4) {
-+    while (limit - data >= 4) {
-         n2s(data, type);
-         n2s(data, size);
--        if (data + size > limit)
-+        if (limit - data < size)
-             return 1;
-         if (custom_ext_parse(s, 1 /* server */ , type, data, size, al) <= 0)
-             return 0;
-@@ -2569,20 +2569,20 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p,
-                              SSL_TLSEXT_HB_DONT_SEND_REQUESTS);
- # endif
--    if (data >= (d + n - 2))
-+    if ((d + n) - data <= 2)
-         goto ri_check;
-     n2s(data, length);
--    if (data + length != d + n) {
-+    if ((d + n) - data != length) {
-         *al = SSL_AD_DECODE_ERROR;
-         return 0;
-     }
--    while (data <= (d + n - 4)) {
-+    while ((d + n) - data >= 4) {
-         n2s(data, type);
-         n2s(data, size);
--        if (data + size > (d + n))
-+        if ((d + n) - data < size)
-             goto ri_check;
-         if (s->tlsext_debug_cb)
-@@ -3307,29 +3307,33 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
-     /* Skip past DTLS cookie */
-     if (SSL_IS_DTLS(s)) {
-         i = *(p++);
--        p += i;
--        if (p >= limit)
-+
-+        if (limit - p <= i)
-             return -1;
-+
-+        p += i;
-     }
-     /* Skip past cipher list */
-     n2s(p, i);
--    p += i;
--    if (p >= limit)
-+    if (limit - p <= i)
-         return -1;
-+    p += i;
-+
-     /* Skip past compression algorithm list */
-     i = *(p++);
--    p += i;
--    if (p > limit)
-+    if (limit - p < i)
-         return -1;
-+    p += i;
-+
-     /* Now at start of extensions */
--    if ((p + 2) >= limit)
-+    if (limit - p <= 2)
-         return 0;
-     n2s(p, i);
--    while ((p + 4) <= limit) {
-+    while (limit - p >= 4) {
-         unsigned short type, size;
-         n2s(p, type);
-         n2s(p, size);
--        if (p + size > limit)
-+        if (limit - p < size)
-             return 0;
-         if (type == TLSEXT_TYPE_session_ticket) {
-             int r;
--- 
-2.3.5
-
diff --git a/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2178.patch b/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2178.patch
deleted file mode 100644 (file)
index 27ade4e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 399944622df7bd81af62e67ea967c470534090e2 Mon Sep 17 00:00:00 2001
-From: Cesar Pereida <cesar.pereida@aalto.fi>
-Date: Mon, 23 May 2016 12:45:25 +0300
-Subject: [PATCH] Fix DSA, preserve BN_FLG_CONSTTIME
-
-Operations in the DSA signing algorithm should run in constant time in
-order to avoid side channel attacks. A flaw in the OpenSSL DSA
-implementation means that a non-constant time codepath is followed for
-certain operations. This has been demonstrated through a cache-timing
-attack to be sufficient for an attacker to recover the private DSA key.
-
-CVE-2016-2178
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-
-Upstream-Status: Backport
-CVE: CVE-2016-2178
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- crypto/dsa/dsa_ossl.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-Index: openssl-1.0.2h/crypto/dsa/dsa_ossl.c
-===================================================================
---- openssl-1.0.2h.orig/crypto/dsa/dsa_ossl.c
-+++ openssl-1.0.2h/crypto/dsa/dsa_ossl.c
-@@ -248,9 +248,6 @@ static int dsa_sign_setup(DSA *dsa, BN_C
-         if (!BN_rand_range(&k, dsa->q))
-             goto err;
-     while (BN_is_zero(&k)) ;
--    if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) {
--        BN_set_flags(&k, BN_FLG_CONSTTIME);
--    }
-     if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
-         if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-@@ -282,6 +279,11 @@ static int dsa_sign_setup(DSA *dsa, BN_C
-     } else {
-         K = &k;
-     }
-+
-+    if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) {
-+        BN_set_flags(K, BN_FLG_CONSTTIME);
-+    }
-+
-     DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, K, dsa->p, ctx,
-                    dsa->method_mont_p);
-     if (!BN_mod(r, r, dsa->q, ctx))
diff --git a/recipes-connectivity/openssl/openssl-qoriq/configure-musl-target.patch b/recipes-connectivity/openssl/openssl-qoriq/configure-musl-target.patch
deleted file mode 100644 (file)
index 613dc7b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Add musl triplet support
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: openssl-1.0.2a/Configure
-===================================================================
---- openssl-1.0.2a.orig/Configure
-+++ openssl-1.0.2a/Configure
-@@ -431,7 +431,7 @@ my %table=(
- #
- #       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
- #
--"linux-armv4",        "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- # Configure script adds minimally required -march for assembly support,
- # if no -march was specified at command line. mips32 and mips64 below
-@@ -504,6 +504,8 @@ my %table=(
- "linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-musleabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-musleabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
index 4f81d85de1a4482e1b939a3e095c1c9307174808..99c94337a042c0cbf280c5af2736ee1a38349cd6 100644 (file)
@@ -1,4 +1,7 @@
-Upstream-Status: Backport
+From ac052c0b383dd6db4cb514a193ba44647504687f Mon Sep 17 00:00:00 2001
+From: Cristian Stoica <cristian.stoica@nxp.com>
+Date: Thu, 5 May 2016 11:55:46 +0300
+Subject: [PATCH] use 64bit integers on x32 systems
 
 When building on x32 systems where the default type is 32bit, make sure
 we can transparently represent 64bit integers.  Otherwise we end up with
@@ -15,21 +18,27 @@ We don't enable this globally as there are some cases where we'd get
 Reported-by: Bertrand Jacquin <bertrand@jacquin.bzh>
 URL: https://bugs.gentoo.org/542618
 
-Signed-off-by: Armin Kuster <akuster@mvista.com>
+Signed-off-By: Armin Kuster <akuster@mvista.com>
+---
+ crypto/perlasm/x86_64-xlate.pl | 5 +++++
+ 1 file changed, 5 insertions(+)
 
-Index: openssl-1.0.2a/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-1.0.2a.orig/crypto/perlasm/x86_64-xlate.pl
-+++ openssl-1.0.2a/crypto/perlasm/x86_64-xlate.pl
-@@ -194,7 +194,10 @@ my %globals;
-     }
+diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
+index 7a3dd04..fc6105d 100755
+--- a/crypto/perlasm/x86_64-xlate.pl
++++ b/crypto/perlasm/x86_64-xlate.pl
+@@ -195,6 +195,11 @@ my %globals;
      sub out {
        my $self = shift;
--
 +      # When building on x32 ABIs, the expanded hex value might be too
 +      # big to fit into 32bits. Enable transparent 64bit support here
 +      # so we can safely print it out.
 +      use bigint;
++
+       $self->{value} =~ s/\b(0b[0-1]+)/oct($1)/eig;
        if ($gas) {
            # Solaris /usr/ccs/bin/as can't handle multiplications
-           # in $self->{value}
+-- 
+2.7.0
+
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/c_rehash-compat.patch
deleted file mode 100644 (file)
index 68e54d5..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Wed, 21 Apr 2010 15:52:10 +0200
-Subject: [PATCH] also create old hash for compatibility
-
-Upstream-Status: Backport [debian]
-
-diff --git a/tools/c_rehash.in b/tools/c_rehash.in
-index b086ff9..b777d79 100644
---- a/tools/c_rehash.in
-+++ b/tools/c_rehash.in
-@@ -8,8 +8,6 @@ my $prefix;
- my $openssl = $ENV{OPENSSL} || "openssl";
- my $pwd;
--my $x509hash = "-subject_hash";
--my $crlhash = "-hash";
- my $verbose = 0;
- my $symlink_exists=eval {symlink("",""); 1};
- my $removelinks = 1;
-@@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ /^-/ ) {
-     my $flag = shift @ARGV;
-     last if ( $flag eq '--');
--    if ( $flag eq '-old') {
--          $x509hash = "-subject_hash_old";
--          $crlhash = "-hash_old";
--    } elsif ( $flag eq '-h') {
-+    if ( $flag eq '-h') {
-           help();
-     } elsif ( $flag eq '-n' ) {
-           $removelinks = 0;
-@@ -113,7 +108,9 @@ sub hash_dir {
-                       next;
-               }
-               link_hash_cert($fname) if($cert);
-+              link_hash_cert_old($fname) if($cert);
-               link_hash_crl($fname) if($crl);
-+              link_hash_crl_old($fname) if($crl);
-       }
- }
-@@ -146,6 +143,7 @@ sub check_file {
- sub link_hash_cert {
-               my $fname = $_[0];
-+              my $x509hash = $_[1] || '-subject_hash';
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
-               chomp $hash;
-@@ -176,11 +174,21 @@ sub link_hash_cert {
-               $hashlist{$hash} = $fprint;
- }
-+sub link_hash_cert_old {
-+              link_hash_cert($_[0], '-subject_hash_old');
-+}
-+
-+sub link_hash_crl_old {
-+              link_hash_crl($_[0], '-hash_old');
-+}
-+
-+
- # Same as above except for a CRL. CRL links are of the form <hash>.r<n>
- sub link_hash_crl {
-               my $fname = $_[0];
-+              my $crlhash = $_[1] || "-hash";
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
-               chomp $hash;
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/ca.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/ca.patch
deleted file mode 100644 (file)
index aba4d42..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===================================================================
---- openssl-0.9.8m.orig/apps/CA.pl.in  2006-04-28 00:28:51.000000000 +0000
-+++ openssl-0.9.8m/apps/CA.pl.in       2010-02-27 00:36:51.000000000 +0000
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
-       if ( /^(-\?|-h|-help)$/ ) {
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 0;
-       } elsif (/^-newcert$/) {
-           # create a certificate
-@@ -165,6 +166,7 @@
-       } else {
-           print STDERR "Unknown arg $_\n";
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 1;
-       }
- }
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/debian-targets.patch
deleted file mode 100644 (file)
index 39d4328..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.2/Configure
-===================================================================
---- openssl-1.0.2.orig/Configure
-+++ openssl-1.0.2/Configure
-@@ -107,6 +107,10 @@ my $gcc_devteam_warn = "-Wall -pedantic
- my $clang_disabled_warnings = "-Wno-language-extension-token -Wno-extended-offsetof -Wno-padded -Wno-shorten-64-to-32 -Wno-format-nonliteral -Wno-missing-noreturn -Wno-unused-parameter -Wno-sign-conversion -Wno-unreachable-code -Wno-conversion -Wno-documentation -Wno-missing-variable-declarations -Wno-cast-align -Wno-incompatible-pointer-types-discards-qualifiers -Wno-missing-variable-declarations -Wno-missing-field-initializers -Wno-unused-macros -Wno-disabled-macro-expansion -Wno-conditional-uninitialized -Wno-switch-enum";
-+# There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
-+my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . `dpkg-buildflags --get LDFLAGS` . "-Wa,--noexecstack -Wall";
-+$debian_cflags =~ s/\n/ /g;
-+
- my $strict_warnings = 0;
- my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -343,6 +347,55 @@ my %table=(
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO ${debian_cflags} -mcpu=ev4::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO ${debian_cflags} -mcpu=ev5::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm64","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armhf","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::",
-+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -fomit-frame-pointer::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i586::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO ${debian_cflags} -march=i686::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32",   "mips64-linux-gnuabin32-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsn32el",   "mips64el-linux-gnuabin32-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64",   "mips64-linux-gnuabi64-gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips64el",   "mips64el-linux-gnuabi64-gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags}::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",        "gcc:-DB_ENDIAN -DTERMIOS ${debian_cflags} -mv8::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS ${debian_cflags}::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS ${debian_cflags} -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-DL_ENDIAN ${debian_cflags}::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-or1k", "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpcspe","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64el","gcc:-m64 -DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-s390x","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-x32","gcc:-mx32 -DL_ENDIAN -DTERMIO ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/man-dir.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/man-dir.patch
deleted file mode 100644 (file)
index 4085e3b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org   2010-12-12 16:11:27.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org        2010-12-12 16:11:37.000000000 +0100
-@@ -131,7 +131,7 @@
- MAKEFILE= Makefile
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/man-section.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/man-section.patch
deleted file mode 100644 (file)
index 21c1d1a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.org
-===================================================================
---- openssl-1.0.0c.orig/Makefile.org   2010-12-12 16:11:37.000000000 +0100
-+++ openssl-1.0.0c/Makefile.org        2010-12-12 16:13:28.000000000 +0100
-@@ -160,7 +160,8 @@
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
- HTMLDIR=$(OPENSSLDIR)/html
- SHELL=/bin/sh
-@@ -651,7 +652,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
-@@ -668,7 +669,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/no-symbolic.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/no-symbolic.patch
deleted file mode 100644 (file)
index cc4408a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.0c/Makefile.shared
-===================================================================
---- openssl-1.0.0c.orig/Makefile.shared        2010-12-12 16:13:36.000000000 +0100
-+++ openssl-1.0.0c/Makefile.shared     2010-12-12 16:13:44.000000000 +0100
-@@ -151,7 +151,7 @@
-       SHLIB_SUFFIX=; \
-       ALLSYMSFLAGS='-Wl,--whole-archive'; \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/pic.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/pic.patch
deleted file mode 100644 (file)
index bfda388..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-1.0.1c/crypto/des/asm/desboth.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/des/asm/desboth.pl      2001-10-24 23:20:56.000000000 +0200
-+++ openssl-1.0.1c/crypto/des/asm/desboth.pl   2012-07-29 14:15:26.000000000 +0200
-@@ -16,6 +16,11 @@
-       &push("edi");
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebp");
-+      &add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
-       &comment("");
-       &comment("Load the data words");
-       &mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "eax");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
-       &mov(&swtmp(1), "edi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "esi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &stack_pop(3);
-       &mov($L,&DWP(0,"ebx","",0));
-Index: openssl-1.0.1c/crypto/perlasm/cbc.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/perlasm/cbc.pl  2011-07-13 08:22:46.000000000 +0200
-+++ openssl-1.0.1c/crypto/perlasm/cbc.pl       2012-07-29 14:15:26.000000000 +0200
-@@ -122,7 +122,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -185,7 +189,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point1"));
-+      &set_label("pic_point1");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -218,7 +226,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point2"));
-+      &set_label("pic_point2");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-@@ -261,7 +273,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point3"));
-+      &set_label("pic_point3");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-Index: openssl-1.0.1c/crypto/perlasm/x86gas.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/perlasm/x86gas.pl       2011-12-09 20:16:35.000000000 +0100
-+++ openssl-1.0.1c/crypto/perlasm/x86gas.pl    2012-07-29 14:15:26.000000000 +0200
-@@ -161,6 +161,7 @@
-       if ($::macosx)  { push (@out,"$tmp,2\n"); }
-       elsif ($::elf)  { push (@out,"$tmp,4\n"); }
-       else            { push (@out,"$tmp\n"); }
-+      if ($::elf)     { push (@out,".hidden\tOPENSSL_ia32cap_P\n"); }
-     }
-     push(@out,$initseg) if ($initseg);
- }
-@@ -218,8 +219,23 @@
-     elsif ($::elf)
-     { $initseg.=<<___;
- .section      .init
-+___
-+        if ($::pic)
-+      {   $initseg.=<<___;
-+      pushl   %ebx
-+      call    .pic_point0
-+.pic_point0:
-+      popl    %ebx
-+      addl    \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+      call    $f\@PLT
-+      popl    %ebx
-+___
-+      }
-+      else
-+      {   $initseg.=<<___;
-       call    $f
- ___
-+      }
-     }
-     elsif ($::coff)
-     {   $initseg.=<<___;      # applies to both Cygwin and Mingw
-Index: openssl-1.0.1c/crypto/x86cpuid.pl
-===================================================================
---- openssl-1.0.1c.orig/crypto/x86cpuid.pl     2012-02-28 15:20:34.000000000 +0100
-+++ openssl-1.0.1c/crypto/x86cpuid.pl  2012-07-29 14:15:26.000000000 +0200
-@@ -8,6 +8,8 @@
- for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
-+push(@out, ".hidden OPENSSL_ia32cap_P\n");
-+
- &function_begin("OPENSSL_ia32_cpuid");
-       &xor    ("edx","edx");
-       &pushf  ();
-@@ -139,9 +141,7 @@
- &set_label("nocpuid");
- &function_end("OPENSSL_ia32_cpuid");
--&external_label("OPENSSL_ia32cap_P");
--
--&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_rdtsc");
-       &xor    ("eax","eax");
-       &xor    ("edx","edx");
-       &picmeup("ecx","OPENSSL_ia32cap_P");
-@@ -155,7 +155,7 @@
- # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
- # but it's safe to call it on any [supported] 32-bit platform...
- # Just check for [non-]zero return value...
--&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_instrument_halt");
-       &picmeup("ecx","OPENSSL_ia32cap_P");
-       &bt     (&DWP(0,"ecx"),4);
-       &jnc    (&label("nohalt"));     # no TSC
-@@ -222,7 +222,7 @@
-       &ret    ();
- &function_end_B("OPENSSL_far_spin");
--&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
-+&function_begin_B("OPENSSL_wipe_cpu");
-       &xor    ("eax","eax");
-       &xor    ("edx","edx");
-       &picmeup("ecx","OPENSSL_ia32cap_P");
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian/version-script.patch b/recipes-connectivity/openssl/openssl-qoriq/debian/version-script.patch
deleted file mode 100644 (file)
index a249180..0000000
+++ /dev/null
@@ -1,4663 +0,0 @@
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
-===================================================================
---- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure     2014-02-24 21:02:30.000000000 +0100
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure  2014-02-24 21:02:30.000000000 +0100
-@@ -1651,6 +1651,8 @@
-               }
-       }
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24 22:19:08.601827266 +0100
-@@ -0,0 +1,4615 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              BIO_f_ssl;
-+              BIO_new_buffer_ssl_connect;
-+              BIO_new_ssl;
-+              BIO_new_ssl_connect;
-+              BIO_proxy_ssl_copy_session_id;
-+              BIO_ssl_copy_session_id;
-+              BIO_ssl_shutdown;
-+              d2i_SSL_SESSION;
-+              DTLSv1_client_method;
-+              DTLSv1_method;
-+              DTLSv1_server_method;
-+              ERR_load_SSL_strings;
-+              i2d_SSL_SESSION;
-+              kssl_build_principal_2;
-+              kssl_cget_tkt;
-+              kssl_check_authent;
-+              kssl_ctx_free;
-+              kssl_ctx_new;
-+              kssl_ctx_setkey;
-+              kssl_ctx_setprinc;
-+              kssl_ctx_setstring;
-+              kssl_ctx_show;
-+              kssl_err_set;
-+              kssl_krb5_free_data_contents;
-+              kssl_sget_tkt;
-+              kssl_skip_confound;
-+              kssl_validate_times;
-+              PEM_read_bio_SSL_SESSION;
-+              PEM_read_SSL_SESSION;
-+              PEM_write_bio_SSL_SESSION;
-+              PEM_write_SSL_SESSION;
-+              SSL_accept;
-+              SSL_add_client_CA;
-+              SSL_add_dir_cert_subjects_to_stack;
-+              SSL_add_dir_cert_subjs_to_stk;
-+              SSL_add_file_cert_subjects_to_stack;
-+              SSL_add_file_cert_subjs_to_stk;
-+              SSL_alert_desc_string;
-+              SSL_alert_desc_string_long;
-+              SSL_alert_type_string;
-+              SSL_alert_type_string_long;
-+              SSL_callback_ctrl;
-+              SSL_check_private_key;
-+              SSL_CIPHER_description;
-+              SSL_CIPHER_get_bits;
-+              SSL_CIPHER_get_name;
-+              SSL_CIPHER_get_version;
-+              SSL_clear;
-+              SSL_COMP_add_compression_method;
-+              SSL_COMP_get_compression_methods;
-+              SSL_COMP_get_compress_methods;
-+              SSL_COMP_get_name;
-+              SSL_connect;
-+              SSL_copy_session_id;
-+              SSL_ctrl;
-+              SSL_CTX_add_client_CA;
-+              SSL_CTX_add_session;
-+              SSL_CTX_callback_ctrl;
-+              SSL_CTX_check_private_key;
-+              SSL_CTX_ctrl;
-+              SSL_CTX_flush_sessions;
-+              SSL_CTX_free;
-+              SSL_CTX_get_cert_store;
-+              SSL_CTX_get_client_CA_list;
-+              SSL_CTX_get_client_cert_cb;
-+              SSL_CTX_get_ex_data;
-+              SSL_CTX_get_ex_new_index;
-+              SSL_CTX_get_info_callback;
-+              SSL_CTX_get_quiet_shutdown;
-+              SSL_CTX_get_timeout;
-+              SSL_CTX_get_verify_callback;
-+              SSL_CTX_get_verify_depth;
-+              SSL_CTX_get_verify_mode;
-+              SSL_CTX_load_verify_locations;
-+              SSL_CTX_new;
-+              SSL_CTX_remove_session;
-+              SSL_CTX_sess_get_get_cb;
-+              SSL_CTX_sess_get_new_cb;
-+              SSL_CTX_sess_get_remove_cb;
-+              SSL_CTX_sessions;
-+              SSL_CTX_sess_set_get_cb;
-+              SSL_CTX_sess_set_new_cb;
-+              SSL_CTX_sess_set_remove_cb;
-+              SSL_CTX_set1_param;
-+              SSL_CTX_set_cert_store;
-+              SSL_CTX_set_cert_verify_callback;
-+              SSL_CTX_set_cert_verify_cb;
-+              SSL_CTX_set_cipher_list;
-+              SSL_CTX_set_client_CA_list;
-+              SSL_CTX_set_client_cert_cb;
-+              SSL_CTX_set_client_cert_engine;
-+              SSL_CTX_set_cookie_generate_cb;
-+              SSL_CTX_set_cookie_verify_cb;
-+              SSL_CTX_set_default_passwd_cb;
-+              SSL_CTX_set_default_passwd_cb_userdata;
-+              SSL_CTX_set_default_verify_paths;
-+              SSL_CTX_set_def_passwd_cb_ud;
-+              SSL_CTX_set_def_verify_paths;
-+              SSL_CTX_set_ex_data;
-+              SSL_CTX_set_generate_session_id;
-+              SSL_CTX_set_info_callback;
-+              SSL_CTX_set_msg_callback;
-+              SSL_CTX_set_psk_client_callback;
-+              SSL_CTX_set_psk_server_callback;
-+              SSL_CTX_set_purpose;
-+              SSL_CTX_set_quiet_shutdown;
-+              SSL_CTX_set_session_id_context;
-+              SSL_CTX_set_ssl_version;
-+              SSL_CTX_set_timeout;
-+              SSL_CTX_set_tmp_dh_callback;
-+              SSL_CTX_set_tmp_ecdh_callback;
-+              SSL_CTX_set_tmp_rsa_callback;
-+              SSL_CTX_set_trust;
-+              SSL_CTX_set_verify;
-+              SSL_CTX_set_verify_depth;
-+              SSL_CTX_use_cert_chain_file;
-+              SSL_CTX_use_certificate;
-+              SSL_CTX_use_certificate_ASN1;
-+              SSL_CTX_use_certificate_chain_file;
-+              SSL_CTX_use_certificate_file;
-+              SSL_CTX_use_PrivateKey;
-+              SSL_CTX_use_PrivateKey_ASN1;
-+              SSL_CTX_use_PrivateKey_file;
-+              SSL_CTX_use_psk_identity_hint;
-+              SSL_CTX_use_RSAPrivateKey;
-+              SSL_CTX_use_RSAPrivateKey_ASN1;
-+              SSL_CTX_use_RSAPrivateKey_file;
-+              SSL_do_handshake;
-+              SSL_dup;
-+              SSL_dup_CA_list;
-+              SSLeay_add_ssl_algorithms;
-+              SSL_free;
-+              SSL_get1_session;
-+              SSL_get_certificate;
-+              SSL_get_cipher_list;
-+              SSL_get_ciphers;
-+              SSL_get_client_CA_list;
-+              SSL_get_current_cipher;
-+              SSL_get_current_compression;
-+              SSL_get_current_expansion;
-+              SSL_get_default_timeout;
-+              SSL_get_error;
-+              SSL_get_ex_data;
-+              SSL_get_ex_data_X509_STORE_CTX_idx;
-+              SSL_get_ex_d_X509_STORE_CTX_idx;
-+              SSL_get_ex_new_index;
-+              SSL_get_fd;
-+              SSL_get_finished;
-+              SSL_get_info_callback;
-+              SSL_get_peer_cert_chain;
-+              SSL_get_peer_certificate;
-+              SSL_get_peer_finished;
-+              SSL_get_privatekey;
-+              SSL_get_psk_identity;
-+              SSL_get_psk_identity_hint;
-+              SSL_get_quiet_shutdown;
-+              SSL_get_rbio;
-+              SSL_get_read_ahead;
-+              SSL_get_rfd;
-+              SSL_get_servername;
-+              SSL_get_servername_type;
-+              SSL_get_session;
-+              SSL_get_shared_ciphers;
-+              SSL_get_shutdown;
-+              SSL_get_SSL_CTX;
-+              SSL_get_ssl_method;
-+              SSL_get_verify_callback;
-+              SSL_get_verify_depth;
-+              SSL_get_verify_mode;
-+              SSL_get_verify_result;
-+              SSL_get_version;
-+              SSL_get_wbio;
-+              SSL_get_wfd;
-+              SSL_has_matching_session_id;
-+              SSL_library_init;
-+              SSL_load_client_CA_file;
-+              SSL_load_error_strings;
-+              SSL_new;
-+              SSL_peek;
-+              SSL_pending;
-+              SSL_read;
-+              SSL_renegotiate;
-+              SSL_renegotiate_pending;
-+              SSL_rstate_string;
-+              SSL_rstate_string_long;
-+              SSL_SESSION_cmp;
-+              SSL_SESSION_free;
-+              SSL_SESSION_get_ex_data;
-+              SSL_SESSION_get_ex_new_index;
-+              SSL_SESSION_get_id;
-+              SSL_SESSION_get_time;
-+              SSL_SESSION_get_timeout;
-+              SSL_SESSION_hash;
-+              SSL_SESSION_new;
-+              SSL_SESSION_print;
-+              SSL_SESSION_print_fp;
-+              SSL_SESSION_set_ex_data;
-+              SSL_SESSION_set_time;
-+              SSL_SESSION_set_timeout;
-+              SSL_set1_param;
-+              SSL_set_accept_state;
-+              SSL_set_bio;
-+              SSL_set_cipher_list;
-+              SSL_set_client_CA_list;
-+              SSL_set_connect_state;
-+              SSL_set_ex_data;
-+              SSL_set_fd;
-+              SSL_set_generate_session_id;
-+              SSL_set_info_callback;
-+              SSL_set_msg_callback;
-+              SSL_set_psk_client_callback;
-+              SSL_set_psk_server_callback;
-+              SSL_set_purpose;
-+              SSL_set_quiet_shutdown;
-+              SSL_set_read_ahead;
-+              SSL_set_rfd;
-+              SSL_set_session;
-+              SSL_set_session_id_context;
-+              SSL_set_session_secret_cb;
-+              SSL_set_session_ticket_ext;
-+              SSL_set_session_ticket_ext_cb;
-+              SSL_set_shutdown;
-+              SSL_set_SSL_CTX;
-+              SSL_set_ssl_method;
-+              SSL_set_tmp_dh_callback;
-+              SSL_set_tmp_ecdh_callback;
-+              SSL_set_tmp_rsa_callback;
-+              SSL_set_trust;
-+              SSL_set_verify;
-+              SSL_set_verify_depth;
-+              SSL_set_verify_result;
-+              SSL_set_wfd;
-+              SSL_shutdown;
-+              SSL_state;
-+              SSL_state_string;
-+              SSL_state_string_long;
-+              SSL_use_certificate;
-+              SSL_use_certificate_ASN1;
-+              SSL_use_certificate_file;
-+              SSL_use_PrivateKey;
-+              SSL_use_PrivateKey_ASN1;
-+              SSL_use_PrivateKey_file;
-+              SSL_use_psk_identity_hint;
-+              SSL_use_RSAPrivateKey;
-+              SSL_use_RSAPrivateKey_ASN1;
-+              SSL_use_RSAPrivateKey_file;
-+              SSLv23_client_method;
-+              SSLv23_method;
-+              SSLv23_server_method;
-+              SSLv2_client_method;
-+              SSLv2_method;
-+              SSLv2_server_method;
-+              SSLv3_client_method;
-+              SSLv3_method;
-+              SSLv3_server_method;
-+              SSL_version;
-+              SSL_want;
-+              SSL_write;
-+              TLSv1_client_method;
-+              TLSv1_method;
-+              TLSv1_server_method;
-+
-+
-+              SSLeay;
-+              SSLeay_version;
-+              ASN1_BIT_STRING_asn1_meth;
-+              ASN1_HEADER_free;
-+              ASN1_HEADER_new;
-+              ASN1_IA5STRING_asn1_meth;
-+              ASN1_INTEGER_get;
-+              ASN1_INTEGER_set;
-+              ASN1_INTEGER_to_BN;
-+              ASN1_OBJECT_create;
-+              ASN1_OBJECT_free;
-+              ASN1_OBJECT_new;
-+              ASN1_PRINTABLE_type;
-+              ASN1_STRING_cmp;
-+              ASN1_STRING_dup;
-+              ASN1_STRING_free;
-+              ASN1_STRING_new;
-+              ASN1_STRING_print;
-+              ASN1_STRING_set;
-+              ASN1_STRING_type_new;
-+              ASN1_TYPE_free;
-+              ASN1_TYPE_new;
-+              ASN1_UNIVERSALSTRING_to_string;
-+              ASN1_UTCTIME_check;
-+              ASN1_UTCTIME_print;
-+              ASN1_UTCTIME_set;
-+              ASN1_check_infinite_end;
-+              ASN1_d2i_bio;
-+              ASN1_d2i_fp;
-+              ASN1_digest;
-+              ASN1_dup;
-+              ASN1_get_object;
-+              ASN1_i2d_bio;
-+              ASN1_i2d_fp;
-+              ASN1_object_size;
-+              ASN1_parse;
-+              ASN1_put_object;
-+              ASN1_sign;
-+              ASN1_verify;
-+              BF_cbc_encrypt;
-+              BF_cfb64_encrypt;
-+              BF_ecb_encrypt;
-+              BF_encrypt;
-+              BF_ofb64_encrypt;
-+              BF_options;
-+              BF_set_key;
-+              BIO_CONNECT_free;
-+              BIO_CONNECT_new;
-+              BIO_accept;
-+              BIO_ctrl;
-+              BIO_int_ctrl;
-+              BIO_debug_callback;
-+              BIO_dump;
-+              BIO_dup_chain;
-+              BIO_f_base64;
-+              BIO_f_buffer;
-+              BIO_f_cipher;
-+              BIO_f_md;
-+              BIO_f_null;
-+              BIO_f_proxy_server;
-+              BIO_fd_non_fatal_error;
-+              BIO_fd_should_retry;
-+              BIO_find_type;
-+              BIO_free;
-+              BIO_free_all;
-+              BIO_get_accept_socket;
-+              BIO_get_filter_bio;
-+              BIO_get_host_ip;
-+              BIO_get_port;
-+              BIO_get_retry_BIO;
-+              BIO_get_retry_reason;
-+              BIO_gethostbyname;
-+              BIO_gets;
-+              BIO_new;
-+              BIO_new_accept;
-+              BIO_new_connect;
-+              BIO_new_fd;
-+              BIO_new_file;
-+              BIO_new_fp;
-+              BIO_new_socket;
-+              BIO_pop;
-+              BIO_printf;
-+              BIO_push;
-+              BIO_puts;
-+              BIO_read;
-+              BIO_s_accept;
-+              BIO_s_connect;
-+              BIO_s_fd;
-+              BIO_s_file;
-+              BIO_s_mem;
-+              BIO_s_null;
-+              BIO_s_proxy_client;
-+              BIO_s_socket;
-+              BIO_set;
-+              BIO_set_cipher;
-+              BIO_set_tcp_ndelay;
-+              BIO_sock_cleanup;
-+              BIO_sock_error;
-+              BIO_sock_init;
-+              BIO_sock_non_fatal_error;
-+              BIO_sock_should_retry;
-+              BIO_socket_ioctl;
-+              BIO_write;
-+              BN_CTX_free;
-+              BN_CTX_new;
-+              BN_MONT_CTX_free;
-+              BN_MONT_CTX_new;
-+              BN_MONT_CTX_set;
-+              BN_add;
-+              BN_add_word;
-+              BN_hex2bn;
-+              BN_bin2bn;
-+              BN_bn2hex;
-+              BN_bn2bin;
-+              BN_clear;
-+              BN_clear_bit;
-+              BN_clear_free;
-+              BN_cmp;
-+              BN_copy;
-+              BN_div;
-+              BN_div_word;
-+              BN_dup;
-+              BN_free;
-+              BN_from_montgomery;
-+              BN_gcd;
-+              BN_generate_prime;
-+              BN_get_word;
-+              BN_is_bit_set;
-+              BN_is_prime;
-+              BN_lshift;
-+              BN_lshift1;
-+              BN_mask_bits;
-+              BN_mod;
-+              BN_mod_exp;
-+              BN_mod_exp_mont;
-+              BN_mod_exp_simple;
-+              BN_mod_inverse;
-+              BN_mod_mul;
-+              BN_mod_mul_montgomery;
-+              BN_mod_word;
-+              BN_mul;
-+              BN_new;
-+              BN_num_bits;
-+              BN_num_bits_word;
-+              BN_options;
-+              BN_print;
-+              BN_print_fp;
-+              BN_rand;
-+              BN_reciprocal;
-+              BN_rshift;
-+              BN_rshift1;
-+              BN_set_bit;
-+              BN_set_word;
-+              BN_sqr;
-+              BN_sub;
-+              BN_to_ASN1_INTEGER;
-+              BN_ucmp;
-+              BN_value_one;
-+              BUF_MEM_free;
-+              BUF_MEM_grow;
-+              BUF_MEM_new;
-+              BUF_strdup;
-+              CONF_free;
-+              CONF_get_number;
-+              CONF_get_section;
-+              CONF_get_string;
-+              CONF_load;
-+              CRYPTO_add_lock;
-+              CRYPTO_dbg_free;
-+              CRYPTO_dbg_malloc;
-+              CRYPTO_dbg_realloc;
-+              CRYPTO_dbg_remalloc;
-+              CRYPTO_free;
-+              CRYPTO_get_add_lock_callback;
-+              CRYPTO_get_id_callback;
-+              CRYPTO_get_lock_name;
-+              CRYPTO_get_locking_callback;
-+              CRYPTO_get_mem_functions;
-+              CRYPTO_lock;
-+              CRYPTO_malloc;
-+              CRYPTO_mem_ctrl;
-+              CRYPTO_mem_leaks;
-+              CRYPTO_mem_leaks_cb;
-+              CRYPTO_mem_leaks_fp;
-+              CRYPTO_realloc;
-+              CRYPTO_remalloc;
-+              CRYPTO_set_add_lock_callback;
-+              CRYPTO_set_id_callback;
-+              CRYPTO_set_locking_callback;
-+              CRYPTO_set_mem_functions;
-+              CRYPTO_thread_id;
-+              DH_check;
-+              DH_compute_key;
-+              DH_free;
-+              DH_generate_key;
-+              DH_generate_parameters;
-+              DH_new;
-+              DH_size;
-+              DHparams_print;
-+              DHparams_print_fp;
-+              DSA_free;
-+              DSA_generate_key;
-+              DSA_generate_parameters;
-+              DSA_is_prime;
-+              DSA_new;
-+              DSA_print;
-+              DSA_print_fp;
-+              DSA_sign;
-+              DSA_sign_setup;
-+              DSA_size;
-+              DSA_verify;
-+              DSAparams_print;
-+              DSAparams_print_fp;
-+              ERR_clear_error;
-+              ERR_error_string;
-+              ERR_free_strings;
-+              ERR_func_error_string;
-+              ERR_get_err_state_table;
-+              ERR_get_error;
-+              ERR_get_error_line;
-+              ERR_get_state;
-+              ERR_get_string_table;
-+              ERR_lib_error_string;
-+              ERR_load_ASN1_strings;
-+              ERR_load_BIO_strings;
-+              ERR_load_BN_strings;
-+              ERR_load_BUF_strings;
-+              ERR_load_CONF_strings;
-+              ERR_load_DH_strings;
-+              ERR_load_DSA_strings;
-+              ERR_load_ERR_strings;
-+              ERR_load_EVP_strings;
-+              ERR_load_OBJ_strings;
-+              ERR_load_PEM_strings;
-+              ERR_load_PROXY_strings;
-+              ERR_load_RSA_strings;
-+              ERR_load_X509_strings;
-+              ERR_load_crypto_strings;
-+              ERR_load_strings;
-+              ERR_peek_error;
-+              ERR_peek_error_line;
-+              ERR_print_errors;
-+              ERR_print_errors_fp;
-+              ERR_put_error;
-+              ERR_reason_error_string;
-+              ERR_remove_state;
-+              EVP_BytesToKey;
-+              EVP_CIPHER_CTX_cleanup;
-+              EVP_CipherFinal;
-+              EVP_CipherInit;
-+              EVP_CipherUpdate;
-+              EVP_DecodeBlock;
-+              EVP_DecodeFinal;
-+              EVP_DecodeInit;
-+              EVP_DecodeUpdate;
-+              EVP_DecryptFinal;
-+              EVP_DecryptInit;
-+              EVP_DecryptUpdate;
-+              EVP_DigestFinal;
-+              EVP_DigestInit;
-+              EVP_DigestUpdate;
-+              EVP_EncodeBlock;
-+              EVP_EncodeFinal;
-+              EVP_EncodeInit;
-+              EVP_EncodeUpdate;
-+              EVP_EncryptFinal;
-+              EVP_EncryptInit;
-+              EVP_EncryptUpdate;
-+              EVP_OpenFinal;
-+              EVP_OpenInit;
-+              EVP_PKEY_assign;
-+              EVP_PKEY_copy_parameters;
-+              EVP_PKEY_free;
-+              EVP_PKEY_missing_parameters;
-+              EVP_PKEY_new;
-+              EVP_PKEY_save_parameters;
-+              EVP_PKEY_size;
-+              EVP_PKEY_type;
-+              EVP_SealFinal;
-+              EVP_SealInit;
-+              EVP_SignFinal;
-+              EVP_VerifyFinal;
-+              EVP_add_alias;
-+              EVP_add_cipher;
-+              EVP_add_digest;
-+              EVP_bf_cbc;
-+              EVP_bf_cfb64;
-+              EVP_bf_ecb;
-+              EVP_bf_ofb;
-+              EVP_cleanup;
-+              EVP_des_cbc;
-+              EVP_des_cfb64;
-+              EVP_des_ecb;
-+              EVP_des_ede;
-+              EVP_des_ede3;
-+              EVP_des_ede3_cbc;
-+              EVP_des_ede3_cfb64;
-+              EVP_des_ede3_ofb;
-+              EVP_des_ede_cbc;
-+              EVP_des_ede_cfb64;
-+              EVP_des_ede_ofb;
-+              EVP_des_ofb;
-+              EVP_desx_cbc;
-+              EVP_dss;
-+              EVP_dss1;
-+              EVP_enc_null;
-+              EVP_get_cipherbyname;
-+              EVP_get_digestbyname;
-+              EVP_get_pw_prompt;
-+              EVP_idea_cbc;
-+              EVP_idea_cfb64;
-+              EVP_idea_ecb;
-+              EVP_idea_ofb;
-+              EVP_md2;
-+              EVP_md5;
-+              EVP_md_null;
-+              EVP_rc2_cbc;
-+              EVP_rc2_cfb64;
-+              EVP_rc2_ecb;
-+              EVP_rc2_ofb;
-+              EVP_rc4;
-+              EVP_read_pw_string;
-+              EVP_set_pw_prompt;
-+              EVP_sha;
-+              EVP_sha1;
-+              MD2;
-+              MD2_Final;
-+              MD2_Init;
-+              MD2_Update;
-+              MD2_options;
-+              MD5;
-+              MD5_Final;
-+              MD5_Init;
-+              MD5_Update;
-+              MDC2;
-+              MDC2_Final;
-+              MDC2_Init;
-+              MDC2_Update;
-+              NETSCAPE_SPKAC_free;
-+              NETSCAPE_SPKAC_new;
-+              NETSCAPE_SPKI_free;
-+              NETSCAPE_SPKI_new;
-+              NETSCAPE_SPKI_sign;
-+              NETSCAPE_SPKI_verify;
-+              OBJ_add_object;
-+              OBJ_bsearch;
-+              OBJ_cleanup;
-+              OBJ_cmp;
-+              OBJ_create;
-+              OBJ_dup;
-+              OBJ_ln2nid;
-+              OBJ_new_nid;
-+              OBJ_nid2ln;
-+              OBJ_nid2obj;
-+              OBJ_nid2sn;
-+              OBJ_obj2nid;
-+              OBJ_sn2nid;
-+              OBJ_txt2nid;
-+              PEM_ASN1_read;
-+              PEM_ASN1_read_bio;
-+              PEM_ASN1_write;
-+              PEM_ASN1_write_bio;
-+              PEM_SealFinal;
-+              PEM_SealInit;
-+              PEM_SealUpdate;
-+              PEM_SignFinal;
-+              PEM_SignInit;
-+              PEM_SignUpdate;
-+              PEM_X509_INFO_read;
-+              PEM_X509_INFO_read_bio;
-+              PEM_X509_INFO_write_bio;
-+              PEM_dek_info;
-+              PEM_do_header;
-+              PEM_get_EVP_CIPHER_INFO;
-+              PEM_proc_type;
-+              PEM_read;
-+              PEM_read_DHparams;
-+              PEM_read_DSAPrivateKey;
-+              PEM_read_DSAparams;
-+              PEM_read_PKCS7;
-+              PEM_read_PrivateKey;
-+              PEM_read_RSAPrivateKey;
-+              PEM_read_X509;
-+              PEM_read_X509_CRL;
-+              PEM_read_X509_REQ;
-+              PEM_read_bio;
-+              PEM_read_bio_DHparams;
-+              PEM_read_bio_DSAPrivateKey;
-+              PEM_read_bio_DSAparams;
-+              PEM_read_bio_PKCS7;
-+              PEM_read_bio_PrivateKey;
-+              PEM_read_bio_RSAPrivateKey;
-+              PEM_read_bio_X509;
-+              PEM_read_bio_X509_CRL;
-+              PEM_read_bio_X509_REQ;
-+              PEM_write;
-+              PEM_write_DHparams;
-+              PEM_write_DSAPrivateKey;
-+              PEM_write_DSAparams;
-+              PEM_write_PKCS7;
-+              PEM_write_PrivateKey;
-+              PEM_write_RSAPrivateKey;
-+              PEM_write_X509;
-+              PEM_write_X509_CRL;
-+              PEM_write_X509_REQ;
-+              PEM_write_bio;
-+              PEM_write_bio_DHparams;
-+              PEM_write_bio_DSAPrivateKey;
-+              PEM_write_bio_DSAparams;
-+              PEM_write_bio_PKCS7;
-+              PEM_write_bio_PrivateKey;
-+              PEM_write_bio_RSAPrivateKey;
-+              PEM_write_bio_X509;
-+              PEM_write_bio_X509_CRL;
-+              PEM_write_bio_X509_REQ;
-+              PKCS7_DIGEST_free;
-+              PKCS7_DIGEST_new;
-+              PKCS7_ENCRYPT_free;
-+              PKCS7_ENCRYPT_new;
-+              PKCS7_ENC_CONTENT_free;
-+              PKCS7_ENC_CONTENT_new;
-+              PKCS7_ENVELOPE_free;
-+              PKCS7_ENVELOPE_new;
-+              PKCS7_ISSUER_AND_SERIAL_digest;
-+              PKCS7_ISSUER_AND_SERIAL_free;
-+              PKCS7_ISSUER_AND_SERIAL_new;
-+              PKCS7_RECIP_INFO_free;
-+              PKCS7_RECIP_INFO_new;
-+              PKCS7_SIGNED_free;
-+              PKCS7_SIGNED_new;
-+              PKCS7_SIGNER_INFO_free;
-+              PKCS7_SIGNER_INFO_new;
-+              PKCS7_SIGN_ENVELOPE_free;
-+              PKCS7_SIGN_ENVELOPE_new;
-+              PKCS7_dup;
-+              PKCS7_free;
-+              PKCS7_new;
-+              PROXY_ENTRY_add_noproxy;
-+              PROXY_ENTRY_clear_noproxy;
-+              PROXY_ENTRY_free;
-+              PROXY_ENTRY_get_noproxy;
-+              PROXY_ENTRY_new;
-+              PROXY_ENTRY_set_server;
-+              PROXY_add_noproxy;
-+              PROXY_add_server;
-+              PROXY_check_by_host;
-+              PROXY_check_url;
-+              PROXY_clear_noproxy;
-+              PROXY_free;
-+              PROXY_get_noproxy;
-+              PROXY_get_proxies;
-+              PROXY_get_proxy_entry;
-+              PROXY_load_conf;
-+              PROXY_new;
-+              PROXY_print;
-+              RAND_bytes;
-+              RAND_cleanup;
-+              RAND_file_name;
-+              RAND_load_file;
-+              RAND_screen;
-+              RAND_seed;
-+              RAND_write_file;
-+              RC2_cbc_encrypt;
-+              RC2_cfb64_encrypt;
-+              RC2_ecb_encrypt;
-+              RC2_encrypt;
-+              RC2_ofb64_encrypt;
-+              RC2_set_key;
-+              RC4;
-+              RC4_options;
-+              RC4_set_key;
-+              RSAPrivateKey_asn1_meth;
-+              RSAPrivateKey_dup;
-+              RSAPublicKey_dup;
-+              RSA_PKCS1_SSLeay;
-+              RSA_free;
-+              RSA_generate_key;
-+              RSA_new;
-+              RSA_new_method;
-+              RSA_print;
-+              RSA_print_fp;
-+              RSA_private_decrypt;
-+              RSA_private_encrypt;
-+              RSA_public_decrypt;
-+              RSA_public_encrypt;
-+              RSA_set_default_method;
-+              RSA_sign;
-+              RSA_sign_ASN1_OCTET_STRING;
-+              RSA_size;
-+              RSA_verify;
-+              RSA_verify_ASN1_OCTET_STRING;
-+              SHA;
-+              SHA1;
-+              SHA1_Final;
-+              SHA1_Init;
-+              SHA1_Update;
-+              SHA_Final;
-+              SHA_Init;
-+              SHA_Update;
-+              OpenSSL_add_all_algorithms;
-+              OpenSSL_add_all_ciphers;
-+              OpenSSL_add_all_digests;
-+              TXT_DB_create_index;
-+              TXT_DB_free;
-+              TXT_DB_get_by_index;
-+              TXT_DB_insert;
-+              TXT_DB_read;
-+              TXT_DB_write;
-+              X509_ALGOR_free;
-+              X509_ALGOR_new;
-+              X509_ATTRIBUTE_free;
-+              X509_ATTRIBUTE_new;
-+              X509_CINF_free;
-+              X509_CINF_new;
-+              X509_CRL_INFO_free;
-+              X509_CRL_INFO_new;
-+              X509_CRL_add_ext;
-+              X509_CRL_cmp;
-+              X509_CRL_delete_ext;
-+              X509_CRL_dup;
-+              X509_CRL_free;
-+              X509_CRL_get_ext;
-+              X509_CRL_get_ext_by_NID;
-+              X509_CRL_get_ext_by_OBJ;
-+              X509_CRL_get_ext_by_critical;
-+              X509_CRL_get_ext_count;
-+              X509_CRL_new;
-+              X509_CRL_sign;
-+              X509_CRL_verify;
-+              X509_EXTENSION_create_by_NID;
-+              X509_EXTENSION_create_by_OBJ;
-+              X509_EXTENSION_dup;
-+              X509_EXTENSION_free;
-+              X509_EXTENSION_get_critical;
-+              X509_EXTENSION_get_data;
-+              X509_EXTENSION_get_object;
-+              X509_EXTENSION_new;
-+              X509_EXTENSION_set_critical;
-+              X509_EXTENSION_set_data;
-+              X509_EXTENSION_set_object;
-+              X509_INFO_free;
-+              X509_INFO_new;
-+              X509_LOOKUP_by_alias;
-+              X509_LOOKUP_by_fingerprint;
-+              X509_LOOKUP_by_issuer_serial;
-+              X509_LOOKUP_by_subject;
-+              X509_LOOKUP_ctrl;
-+              X509_LOOKUP_file;
-+              X509_LOOKUP_free;
-+              X509_LOOKUP_hash_dir;
-+              X509_LOOKUP_init;
-+              X509_LOOKUP_new;
-+              X509_LOOKUP_shutdown;
-+              X509_NAME_ENTRY_create_by_NID;
-+              X509_NAME_ENTRY_create_by_OBJ;
-+              X509_NAME_ENTRY_dup;
-+              X509_NAME_ENTRY_free;
-+              X509_NAME_ENTRY_get_data;
-+              X509_NAME_ENTRY_get_object;
-+              X509_NAME_ENTRY_new;
-+              X509_NAME_ENTRY_set_data;
-+              X509_NAME_ENTRY_set_object;
-+              X509_NAME_add_entry;
-+              X509_NAME_cmp;
-+              X509_NAME_delete_entry;
-+              X509_NAME_digest;
-+              X509_NAME_dup;
-+              X509_NAME_entry_count;
-+              X509_NAME_free;
-+              X509_NAME_get_entry;
-+              X509_NAME_get_index_by_NID;
-+              X509_NAME_get_index_by_OBJ;
-+              X509_NAME_get_text_by_NID;
-+              X509_NAME_get_text_by_OBJ;
-+              X509_NAME_hash;
-+              X509_NAME_new;
-+              X509_NAME_oneline;
-+              X509_NAME_print;
-+              X509_NAME_set;
-+              X509_OBJECT_free_contents;
-+              X509_OBJECT_retrieve_by_subject;
-+              X509_OBJECT_up_ref_count;
-+              X509_PKEY_free;
-+              X509_PKEY_new;
-+              X509_PUBKEY_free;
-+              X509_PUBKEY_get;
-+              X509_PUBKEY_new;
-+              X509_PUBKEY_set;
-+              X509_REQ_INFO_free;
-+              X509_REQ_INFO_new;
-+              X509_REQ_dup;
-+              X509_REQ_free;
-+              X509_REQ_get_pubkey;
-+              X509_REQ_new;
-+              X509_REQ_print;
-+              X509_REQ_print_fp;
-+              X509_REQ_set_pubkey;
-+              X509_REQ_set_subject_name;
-+              X509_REQ_set_version;
-+              X509_REQ_sign;
-+              X509_REQ_to_X509;
-+              X509_REQ_verify;
-+              X509_REVOKED_add_ext;
-+              X509_REVOKED_delete_ext;
-+              X509_REVOKED_free;
-+              X509_REVOKED_get_ext;
-+              X509_REVOKED_get_ext_by_NID;
-+              X509_REVOKED_get_ext_by_OBJ;
-+              X509_REVOKED_get_ext_by_critical;
-+              X509_REVOKED_get_ext_by_critic;
-+              X509_REVOKED_get_ext_count;
-+              X509_REVOKED_new;
-+              X509_SIG_free;
-+              X509_SIG_new;
-+              X509_STORE_CTX_cleanup;
-+              X509_STORE_CTX_init;
-+              X509_STORE_add_cert;
-+              X509_STORE_add_lookup;
-+              X509_STORE_free;
-+              X509_STORE_get_by_subject;
-+              X509_STORE_load_locations;
-+              X509_STORE_new;
-+              X509_STORE_set_default_paths;
-+              X509_VAL_free;
-+              X509_VAL_new;
-+              X509_add_ext;
-+              X509_asn1_meth;
-+              X509_certificate_type;
-+              X509_check_private_key;
-+              X509_cmp_current_time;
-+              X509_delete_ext;
-+              X509_digest;
-+              X509_dup;
-+              X509_free;
-+              X509_get_default_cert_area;
-+              X509_get_default_cert_dir;
-+              X509_get_default_cert_dir_env;
-+              X509_get_default_cert_file;
-+              X509_get_default_cert_file_env;
-+              X509_get_default_private_dir;
-+              X509_get_ext;
-+              X509_get_ext_by_NID;
-+              X509_get_ext_by_OBJ;
-+              X509_get_ext_by_critical;
-+              X509_get_ext_count;
-+              X509_get_issuer_name;
-+              X509_get_pubkey;
-+              X509_get_pubkey_parameters;
-+              X509_get_serialNumber;
-+              X509_get_subject_name;
-+              X509_gmtime_adj;
-+              X509_issuer_and_serial_cmp;
-+              X509_issuer_and_serial_hash;
-+              X509_issuer_name_cmp;
-+              X509_issuer_name_hash;
-+              X509_load_cert_file;
-+              X509_new;
-+              X509_print;
-+              X509_print_fp;
-+              X509_set_issuer_name;
-+              X509_set_notAfter;
-+              X509_set_notBefore;
-+              X509_set_pubkey;
-+              X509_set_serialNumber;
-+              X509_set_subject_name;
-+              X509_set_version;
-+              X509_sign;
-+              X509_subject_name_cmp;
-+              X509_subject_name_hash;
-+              X509_to_X509_REQ;
-+              X509_verify;
-+              X509_verify_cert;
-+              X509_verify_cert_error_string;
-+              X509v3_add_ext;
-+              X509v3_add_extension;
-+              X509v3_add_netscape_extensions;
-+              X509v3_add_standard_extensions;
-+              X509v3_cleanup_extensions;
-+              X509v3_data_type_by_NID;
-+              X509v3_data_type_by_OBJ;
-+              X509v3_delete_ext;
-+              X509v3_get_ext;
-+              X509v3_get_ext_by_NID;
-+              X509v3_get_ext_by_OBJ;
-+              X509v3_get_ext_by_critical;
-+              X509v3_get_ext_count;
-+              X509v3_pack_string;
-+              X509v3_pack_type_by_NID;
-+              X509v3_pack_type_by_OBJ;
-+              X509v3_unpack_string;
-+              _des_crypt;
-+              a2d_ASN1_OBJECT;
-+              a2i_ASN1_INTEGER;
-+              a2i_ASN1_STRING;
-+              asn1_Finish;
-+              asn1_GetSequence;
-+              bn_div_words;
-+              bn_expand2;
-+              bn_mul_add_words;
-+              bn_mul_words;
-+              BN_uadd;
-+              BN_usub;
-+              bn_sqr_words;
-+              _ossl_old_crypt;
-+              d2i_ASN1_BIT_STRING;
-+              d2i_ASN1_BOOLEAN;
-+              d2i_ASN1_HEADER;
-+              d2i_ASN1_IA5STRING;
-+              d2i_ASN1_INTEGER;
-+              d2i_ASN1_OBJECT;
-+              d2i_ASN1_OCTET_STRING;
-+              d2i_ASN1_PRINTABLE;
-+              d2i_ASN1_PRINTABLESTRING;
-+              d2i_ASN1_SET;
-+              d2i_ASN1_T61STRING;
-+              d2i_ASN1_TYPE;
-+              d2i_ASN1_UTCTIME;
-+              d2i_ASN1_bytes;
-+              d2i_ASN1_type_bytes;
-+              d2i_DHparams;
-+              d2i_DSAPrivateKey;
-+              d2i_DSAPrivateKey_bio;
-+              d2i_DSAPrivateKey_fp;
-+              d2i_DSAPublicKey;
-+              d2i_DSAparams;
-+              d2i_NETSCAPE_SPKAC;
-+              d2i_NETSCAPE_SPKI;
-+              d2i_Netscape_RSA;
-+              d2i_PKCS7;
-+              d2i_PKCS7_DIGEST;
-+              d2i_PKCS7_ENCRYPT;
-+              d2i_PKCS7_ENC_CONTENT;
-+              d2i_PKCS7_ENVELOPE;
-+              d2i_PKCS7_ISSUER_AND_SERIAL;
-+              d2i_PKCS7_RECIP_INFO;
-+              d2i_PKCS7_SIGNED;
-+              d2i_PKCS7_SIGNER_INFO;
-+              d2i_PKCS7_SIGN_ENVELOPE;
-+              d2i_PKCS7_bio;
-+              d2i_PKCS7_fp;
-+              d2i_PrivateKey;
-+              d2i_PublicKey;
-+              d2i_RSAPrivateKey;
-+              d2i_RSAPrivateKey_bio;
-+              d2i_RSAPrivateKey_fp;
-+              d2i_RSAPublicKey;
-+              d2i_X509;
-+              d2i_X509_ALGOR;
-+              d2i_X509_ATTRIBUTE;
-+              d2i_X509_CINF;
-+              d2i_X509_CRL;
-+              d2i_X509_CRL_INFO;
-+              d2i_X509_CRL_bio;
-+              d2i_X509_CRL_fp;
-+              d2i_X509_EXTENSION;
-+              d2i_X509_NAME;
-+              d2i_X509_NAME_ENTRY;
-+              d2i_X509_PKEY;
-+              d2i_X509_PUBKEY;
-+              d2i_X509_REQ;
-+              d2i_X509_REQ_INFO;
-+              d2i_X509_REQ_bio;
-+              d2i_X509_REQ_fp;
-+              d2i_X509_REVOKED;
-+              d2i_X509_SIG;
-+              d2i_X509_VAL;
-+              d2i_X509_bio;
-+              d2i_X509_fp;
-+              DES_cbc_cksum;
-+              DES_cbc_encrypt;
-+              DES_cblock_print_file;
-+              DES_cfb64_encrypt;
-+              DES_cfb_encrypt;
-+              DES_decrypt3;
-+              DES_ecb3_encrypt;
-+              DES_ecb_encrypt;
-+              DES_ede3_cbc_encrypt;
-+              DES_ede3_cfb64_encrypt;
-+              DES_ede3_ofb64_encrypt;
-+              DES_enc_read;
-+              DES_enc_write;
-+              DES_encrypt1;
-+              DES_encrypt2;
-+              DES_encrypt3;
-+              DES_fcrypt;
-+              DES_is_weak_key;
-+              DES_key_sched;
-+              DES_ncbc_encrypt;
-+              DES_ofb64_encrypt;
-+              DES_ofb_encrypt;
-+              DES_options;
-+              DES_pcbc_encrypt;
-+              DES_quad_cksum;
-+              DES_random_key;
-+              _ossl_old_des_random_seed;
-+              _ossl_old_des_read_2passwords;
-+              _ossl_old_des_read_password;
-+              _ossl_old_des_read_pw;
-+              _ossl_old_des_read_pw_string;
-+              DES_set_key;
-+              DES_set_odd_parity;
-+              DES_string_to_2keys;
-+              DES_string_to_key;
-+              DES_xcbc_encrypt;
-+              DES_xwhite_in2out;
-+              fcrypt_body;
-+              i2a_ASN1_INTEGER;
-+              i2a_ASN1_OBJECT;
-+              i2a_ASN1_STRING;
-+              i2d_ASN1_BIT_STRING;
-+              i2d_ASN1_BOOLEAN;
-+              i2d_ASN1_HEADER;
-+              i2d_ASN1_IA5STRING;
-+              i2d_ASN1_INTEGER;
-+              i2d_ASN1_OBJECT;
-+              i2d_ASN1_OCTET_STRING;
-+              i2d_ASN1_PRINTABLE;
-+              i2d_ASN1_SET;
-+              i2d_ASN1_TYPE;
-+              i2d_ASN1_UTCTIME;
-+              i2d_ASN1_bytes;
-+              i2d_DHparams;
-+              i2d_DSAPrivateKey;
-+              i2d_DSAPrivateKey_bio;
-+              i2d_DSAPrivateKey_fp;
-+              i2d_DSAPublicKey;
-+              i2d_DSAparams;
-+              i2d_NETSCAPE_SPKAC;
-+              i2d_NETSCAPE_SPKI;
-+              i2d_Netscape_RSA;
-+              i2d_PKCS7;
-+              i2d_PKCS7_DIGEST;
-+              i2d_PKCS7_ENCRYPT;
-+              i2d_PKCS7_ENC_CONTENT;
-+              i2d_PKCS7_ENVELOPE;
-+              i2d_PKCS7_ISSUER_AND_SERIAL;
-+              i2d_PKCS7_RECIP_INFO;
-+              i2d_PKCS7_SIGNED;
-+              i2d_PKCS7_SIGNER_INFO;
-+              i2d_PKCS7_SIGN_ENVELOPE;
-+              i2d_PKCS7_bio;
-+              i2d_PKCS7_fp;
-+              i2d_PrivateKey;
-+              i2d_PublicKey;
-+              i2d_RSAPrivateKey;
-+              i2d_RSAPrivateKey_bio;
-+              i2d_RSAPrivateKey_fp;
-+              i2d_RSAPublicKey;
-+              i2d_X509;
-+              i2d_X509_ALGOR;
-+              i2d_X509_ATTRIBUTE;
-+              i2d_X509_CINF;
-+              i2d_X509_CRL;
-+              i2d_X509_CRL_INFO;
-+              i2d_X509_CRL_bio;
-+              i2d_X509_CRL_fp;
-+              i2d_X509_EXTENSION;
-+              i2d_X509_NAME;
-+              i2d_X509_NAME_ENTRY;
-+              i2d_X509_PKEY;
-+              i2d_X509_PUBKEY;
-+              i2d_X509_REQ;
-+              i2d_X509_REQ_INFO;
-+              i2d_X509_REQ_bio;
-+              i2d_X509_REQ_fp;
-+              i2d_X509_REVOKED;
-+              i2d_X509_SIG;
-+              i2d_X509_VAL;
-+              i2d_X509_bio;
-+              i2d_X509_fp;
-+              idea_cbc_encrypt;
-+              idea_cfb64_encrypt;
-+              idea_ecb_encrypt;
-+              idea_encrypt;
-+              idea_ofb64_encrypt;
-+              idea_options;
-+              idea_set_decrypt_key;
-+              idea_set_encrypt_key;
-+              lh_delete;
-+              lh_doall;
-+              lh_doall_arg;
-+              lh_free;
-+              lh_insert;
-+              lh_new;
-+              lh_node_stats;
-+              lh_node_stats_bio;
-+              lh_node_usage_stats;
-+              lh_node_usage_stats_bio;
-+              lh_retrieve;
-+              lh_stats;
-+              lh_stats_bio;
-+              lh_strhash;
-+              sk_delete;
-+              sk_delete_ptr;
-+              sk_dup;
-+              sk_find;
-+              sk_free;
-+              sk_insert;
-+              sk_new;
-+              sk_pop;
-+              sk_pop_free;
-+              sk_push;
-+              sk_set_cmp_func;
-+              sk_shift;
-+              sk_unshift;
-+              sk_zero;
-+              BIO_f_nbio_test;
-+              ASN1_TYPE_get;
-+              ASN1_TYPE_set;
-+              PKCS7_content_free;
-+              ERR_load_PKCS7_strings;
-+              X509_find_by_issuer_and_serial;
-+              X509_find_by_subject;
-+              PKCS7_ctrl;
-+              PKCS7_set_type;
-+              PKCS7_set_content;
-+              PKCS7_SIGNER_INFO_set;
-+              PKCS7_add_signer;
-+              PKCS7_add_certificate;
-+              PKCS7_add_crl;
-+              PKCS7_content_new;
-+              PKCS7_dataSign;
-+              PKCS7_dataVerify;
-+              PKCS7_dataInit;
-+              PKCS7_add_signature;
-+              PKCS7_cert_from_signer_info;
-+              PKCS7_get_signer_info;
-+              EVP_delete_alias;
-+              EVP_mdc2;
-+              PEM_read_bio_RSAPublicKey;
-+              PEM_write_bio_RSAPublicKey;
-+              d2i_RSAPublicKey_bio;
-+              i2d_RSAPublicKey_bio;
-+              PEM_read_RSAPublicKey;
-+              PEM_write_RSAPublicKey;
-+              d2i_RSAPublicKey_fp;
-+              i2d_RSAPublicKey_fp;
-+              BIO_copy_next_retry;
-+              RSA_flags;
-+              X509_STORE_add_crl;
-+              X509_load_crl_file;
-+              EVP_rc2_40_cbc;
-+              EVP_rc4_40;
-+              EVP_CIPHER_CTX_init;
-+              HMAC;
-+              HMAC_Init;
-+              HMAC_Update;
-+              HMAC_Final;
-+              ERR_get_next_error_library;
-+              EVP_PKEY_cmp_parameters;
-+              HMAC_cleanup;
-+              BIO_ptr_ctrl;
-+              BIO_new_file_internal;
-+              BIO_new_fp_internal;
-+              BIO_s_file_internal;
-+              BN_BLINDING_convert;
-+              BN_BLINDING_invert;
-+              BN_BLINDING_update;
-+              RSA_blinding_on;
-+              RSA_blinding_off;
-+              i2t_ASN1_OBJECT;
-+              BN_BLINDING_new;
-+              BN_BLINDING_free;
-+              EVP_cast5_cbc;
-+              EVP_cast5_cfb64;
-+              EVP_cast5_ecb;
-+              EVP_cast5_ofb;
-+              BF_decrypt;
-+              CAST_set_key;
-+              CAST_encrypt;
-+              CAST_decrypt;
-+              CAST_ecb_encrypt;
-+              CAST_cbc_encrypt;
-+              CAST_cfb64_encrypt;
-+              CAST_ofb64_encrypt;
-+              RC2_decrypt;
-+              OBJ_create_objects;
-+              BN_exp;
-+              BN_mul_word;
-+              BN_sub_word;
-+              BN_dec2bn;
-+              BN_bn2dec;
-+              BIO_ghbn_ctrl;
-+              CRYPTO_free_ex_data;
-+              CRYPTO_get_ex_data;
-+              CRYPTO_set_ex_data;
-+              ERR_load_CRYPTO_strings;
-+              ERR_load_CRYPTOlib_strings;
-+              EVP_PKEY_bits;
-+              MD5_Transform;
-+              SHA1_Transform;
-+              SHA_Transform;
-+              X509_STORE_CTX_get_chain;
-+              X509_STORE_CTX_get_current_cert;
-+              X509_STORE_CTX_get_error;
-+              X509_STORE_CTX_get_error_depth;
-+              X509_STORE_CTX_get_ex_data;
-+              X509_STORE_CTX_set_cert;
-+              X509_STORE_CTX_set_chain;
-+              X509_STORE_CTX_set_error;
-+              X509_STORE_CTX_set_ex_data;
-+              CRYPTO_dup_ex_data;
-+              CRYPTO_get_new_lockid;
-+              CRYPTO_new_ex_data;
-+              RSA_set_ex_data;
-+              RSA_get_ex_data;
-+              RSA_get_ex_new_index;
-+              RSA_padding_add_PKCS1_type_1;
-+              RSA_padding_add_PKCS1_type_2;
-+              RSA_padding_add_SSLv23;
-+              RSA_padding_add_none;
-+              RSA_padding_check_PKCS1_type_1;
-+              RSA_padding_check_PKCS1_type_2;
-+              RSA_padding_check_SSLv23;
-+              RSA_padding_check_none;
-+              bn_add_words;
-+              d2i_Netscape_RSA_2;
-+              CRYPTO_get_ex_new_index;
-+              RIPEMD160_Init;
-+              RIPEMD160_Update;
-+              RIPEMD160_Final;
-+              RIPEMD160;
-+              RIPEMD160_Transform;
-+              RC5_32_set_key;
-+              RC5_32_ecb_encrypt;
-+              RC5_32_encrypt;
-+              RC5_32_decrypt;
-+              RC5_32_cbc_encrypt;
-+              RC5_32_cfb64_encrypt;
-+              RC5_32_ofb64_encrypt;
-+              BN_bn2mpi;
-+              BN_mpi2bn;
-+              ASN1_BIT_STRING_get_bit;
-+              ASN1_BIT_STRING_set_bit;
-+              BIO_get_ex_data;
-+              BIO_get_ex_new_index;
-+              BIO_set_ex_data;
-+              X509v3_get_key_usage;
-+              X509v3_set_key_usage;
-+              a2i_X509v3_key_usage;
-+              i2a_X509v3_key_usage;
-+              EVP_PKEY_decrypt;
-+              EVP_PKEY_encrypt;
-+              PKCS7_RECIP_INFO_set;
-+              PKCS7_add_recipient;
-+              PKCS7_add_recipient_info;
-+              PKCS7_set_cipher;
-+              ASN1_TYPE_get_int_octetstring;
-+              ASN1_TYPE_get_octetstring;
-+              ASN1_TYPE_set_int_octetstring;
-+              ASN1_TYPE_set_octetstring;
-+              ASN1_UTCTIME_set_string;
-+              ERR_add_error_data;
-+              ERR_set_error_data;
-+              EVP_CIPHER_asn1_to_param;
-+              EVP_CIPHER_param_to_asn1;
-+              EVP_CIPHER_get_asn1_iv;
-+              EVP_CIPHER_set_asn1_iv;
-+              EVP_rc5_32_12_16_cbc;
-+              EVP_rc5_32_12_16_cfb64;
-+              EVP_rc5_32_12_16_ecb;
-+              EVP_rc5_32_12_16_ofb;
-+              asn1_add_error;
-+              d2i_ASN1_BMPSTRING;
-+              i2d_ASN1_BMPSTRING;
-+              BIO_f_ber;
-+              BN_init;
-+              COMP_CTX_new;
-+              COMP_CTX_free;
-+              COMP_CTX_compress_block;
-+              COMP_CTX_expand_block;
-+              X509_STORE_CTX_get_ex_new_index;
-+              OBJ_NAME_add;
-+              BIO_socket_nbio;
-+              EVP_rc2_64_cbc;
-+              OBJ_NAME_cleanup;
-+              OBJ_NAME_get;
-+              OBJ_NAME_init;
-+              OBJ_NAME_new_index;
-+              OBJ_NAME_remove;
-+              BN_MONT_CTX_copy;
-+              BIO_new_socks4a_connect;
-+              BIO_s_socks4a_connect;
-+              PROXY_set_connect_mode;
-+              RAND_SSLeay;
-+              RAND_set_rand_method;
-+              RSA_memory_lock;
-+              bn_sub_words;
-+              bn_mul_normal;
-+              bn_mul_comba8;
-+              bn_mul_comba4;
-+              bn_sqr_normal;
-+              bn_sqr_comba8;
-+              bn_sqr_comba4;
-+              bn_cmp_words;
-+              bn_mul_recursive;
-+              bn_mul_part_recursive;
-+              bn_sqr_recursive;
-+              bn_mul_low_normal;
-+              BN_RECP_CTX_init;
-+              BN_RECP_CTX_new;
-+              BN_RECP_CTX_free;
-+              BN_RECP_CTX_set;
-+              BN_mod_mul_reciprocal;
-+              BN_mod_exp_recp;
-+              BN_div_recp;
-+              BN_CTX_init;
-+              BN_MONT_CTX_init;
-+              RAND_get_rand_method;
-+              PKCS7_add_attribute;
-+              PKCS7_add_signed_attribute;
-+              PKCS7_digest_from_attributes;
-+              PKCS7_get_attribute;
-+              PKCS7_get_issuer_and_serial;
-+              PKCS7_get_signed_attribute;
-+              COMP_compress_block;
-+              COMP_expand_block;
-+              COMP_rle;
-+              COMP_zlib;
-+              ms_time_diff;
-+              ms_time_new;
-+              ms_time_free;
-+              ms_time_cmp;
-+              ms_time_get;
-+              PKCS7_set_attributes;
-+              PKCS7_set_signed_attributes;
-+              X509_ATTRIBUTE_create;
-+              X509_ATTRIBUTE_dup;
-+              ASN1_GENERALIZEDTIME_check;
-+              ASN1_GENERALIZEDTIME_print;
-+              ASN1_GENERALIZEDTIME_set;
-+              ASN1_GENERALIZEDTIME_set_string;
-+              ASN1_TIME_print;
-+              BASIC_CONSTRAINTS_free;
-+              BASIC_CONSTRAINTS_new;
-+              ERR_load_X509V3_strings;
-+              NETSCAPE_CERT_SEQUENCE_free;
-+              NETSCAPE_CERT_SEQUENCE_new;
-+              OBJ_txt2obj;
-+              PEM_read_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_NS_CERT_SEQ;
-+              PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_bio_NS_CERT_SEQ;
-+              PEM_write_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_NS_CERT_SEQ;
-+              PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_bio_NS_CERT_SEQ;
-+              X509V3_EXT_add;
-+              X509V3_EXT_add_alias;
-+              X509V3_EXT_add_conf;
-+              X509V3_EXT_cleanup;
-+              X509V3_EXT_conf;
-+              X509V3_EXT_conf_nid;
-+              X509V3_EXT_get;
-+              X509V3_EXT_get_nid;
-+              X509V3_EXT_print;
-+              X509V3_EXT_print_fp;
-+              X509V3_add_standard_extensions;
-+              X509V3_add_value;
-+              X509V3_add_value_bool;
-+              X509V3_add_value_int;
-+              X509V3_conf_free;
-+              X509V3_get_value_bool;
-+              X509V3_get_value_int;
-+              X509V3_parse_list;
-+              d2i_ASN1_GENERALIZEDTIME;
-+              d2i_ASN1_TIME;
-+              d2i_BASIC_CONSTRAINTS;
-+              d2i_NETSCAPE_CERT_SEQUENCE;
-+              d2i_ext_ku;
-+              ext_ku_free;
-+              ext_ku_new;
-+              i2d_ASN1_GENERALIZEDTIME;
-+              i2d_ASN1_TIME;
-+              i2d_BASIC_CONSTRAINTS;
-+              i2d_NETSCAPE_CERT_SEQUENCE;
-+              i2d_ext_ku;
-+              EVP_MD_CTX_copy;
-+              i2d_ASN1_ENUMERATED;
-+              d2i_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_set;
-+              ASN1_ENUMERATED_get;
-+              BN_to_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_to_BN;
-+              i2a_ASN1_ENUMERATED;
-+              a2i_ASN1_ENUMERATED;
-+              i2d_GENERAL_NAME;
-+              d2i_GENERAL_NAME;
-+              GENERAL_NAME_new;
-+              GENERAL_NAME_free;
-+              GENERAL_NAMES_new;
-+              GENERAL_NAMES_free;
-+              d2i_GENERAL_NAMES;
-+              i2d_GENERAL_NAMES;
-+              i2v_GENERAL_NAMES;
-+              i2s_ASN1_OCTET_STRING;
-+              s2i_ASN1_OCTET_STRING;
-+              X509V3_EXT_check_conf;
-+              hex_to_string;
-+              string_to_hex;
-+              DES_ede3_cbcm_encrypt;
-+              RSA_padding_add_PKCS1_OAEP;
-+              RSA_padding_check_PKCS1_OAEP;
-+              X509_CRL_print_fp;
-+              X509_CRL_print;
-+              i2v_GENERAL_NAME;
-+              v2i_GENERAL_NAME;
-+              i2d_PKEY_USAGE_PERIOD;
-+              d2i_PKEY_USAGE_PERIOD;
-+              PKEY_USAGE_PERIOD_new;
-+              PKEY_USAGE_PERIOD_free;
-+              v2i_GENERAL_NAMES;
-+              i2s_ASN1_INTEGER;
-+              X509V3_EXT_d2i;
-+              name_cmp;
-+              str_dup;
-+              i2s_ASN1_ENUMERATED;
-+              i2s_ASN1_ENUMERATED_TABLE;
-+              BIO_s_log;
-+              BIO_f_reliable;
-+              PKCS7_dataFinal;
-+              PKCS7_dataDecode;
-+              X509V3_EXT_CRL_add_conf;
-+              BN_set_params;
-+              BN_get_params;
-+              BIO_get_ex_num;
-+              BIO_set_ex_free_func;
-+              EVP_ripemd160;
-+              ASN1_TIME_set;
-+              i2d_AUTHORITY_KEYID;
-+              d2i_AUTHORITY_KEYID;
-+              AUTHORITY_KEYID_new;
-+              AUTHORITY_KEYID_free;
-+              ASN1_seq_unpack;
-+              ASN1_seq_pack;
-+              ASN1_unpack_string;
-+              ASN1_pack_string;
-+              PKCS12_pack_safebag;
-+              PKCS12_MAKE_KEYBAG;
-+              PKCS8_encrypt;
-+              PKCS12_MAKE_SHKEYBAG;
-+              PKCS12_pack_p7data;
-+              PKCS12_pack_p7encdata;
-+              PKCS12_add_localkeyid;
-+              PKCS12_add_friendlyname_asc;
-+              PKCS12_add_friendlyname_uni;
-+              PKCS12_get_friendlyname;
-+              PKCS12_pbe_crypt;
-+              PKCS12_decrypt_d2i;
-+              PKCS12_i2d_encrypt;
-+              PKCS12_init;
-+              PKCS12_key_gen_asc;
-+              PKCS12_key_gen_uni;
-+              PKCS12_gen_mac;
-+              PKCS12_verify_mac;
-+              PKCS12_set_mac;
-+              PKCS12_setup_mac;
-+              OPENSSL_asc2uni;
-+              OPENSSL_uni2asc;
-+              i2d_PKCS12_BAGS;
-+              PKCS12_BAGS_new;
-+              d2i_PKCS12_BAGS;
-+              PKCS12_BAGS_free;
-+              i2d_PKCS12;
-+              d2i_PKCS12;
-+              PKCS12_new;
-+              PKCS12_free;
-+              i2d_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_new;
-+              d2i_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_free;
-+              i2d_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_new;
-+              d2i_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_free;
-+              ERR_load_PKCS12_strings;
-+              PKCS12_PBE_add;
-+              PKCS8_add_keyusage;
-+              PKCS12_get_attr_gen;
-+              PKCS12_parse;
-+              PKCS12_create;
-+              i2d_PKCS12_bio;
-+              i2d_PKCS12_fp;
-+              d2i_PKCS12_bio;
-+              d2i_PKCS12_fp;
-+              i2d_PBEPARAM;
-+              PBEPARAM_new;
-+              d2i_PBEPARAM;
-+              PBEPARAM_free;
-+              i2d_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_new;
-+              d2i_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_free;
-+              EVP_PKCS82PKEY;
-+              EVP_PKEY2PKCS8;
-+              PKCS8_set_broken;
-+              EVP_PBE_ALGOR_CipherInit;
-+              EVP_PBE_alg_add;
-+              PKCS5_pbe_set;
-+              EVP_PBE_cleanup;
-+              i2d_SXNET;
-+              d2i_SXNET;
-+              SXNET_new;
-+              SXNET_free;
-+              i2d_SXNETID;
-+              d2i_SXNETID;
-+              SXNETID_new;
-+              SXNETID_free;
-+              DSA_SIG_new;
-+              DSA_SIG_free;
-+              DSA_do_sign;
-+              DSA_do_verify;
-+              d2i_DSA_SIG;
-+              i2d_DSA_SIG;
-+              i2d_ASN1_VISIBLESTRING;
-+              d2i_ASN1_VISIBLESTRING;
-+              i2d_ASN1_UTF8STRING;
-+              d2i_ASN1_UTF8STRING;
-+              i2d_DIRECTORYSTRING;
-+              d2i_DIRECTORYSTRING;
-+              i2d_DISPLAYTEXT;
-+              d2i_DISPLAYTEXT;
-+              d2i_ASN1_SET_OF_X509;
-+              i2d_ASN1_SET_OF_X509;
-+              i2d_PBKDF2PARAM;
-+              PBKDF2PARAM_new;
-+              d2i_PBKDF2PARAM;
-+              PBKDF2PARAM_free;
-+              i2d_PBE2PARAM;
-+              PBE2PARAM_new;
-+              d2i_PBE2PARAM;
-+              PBE2PARAM_free;
-+              d2i_ASN1_SET_OF_GENERAL_NAME;
-+              i2d_ASN1_SET_OF_GENERAL_NAME;
-+              d2i_ASN1_SET_OF_SXNETID;
-+              i2d_ASN1_SET_OF_SXNETID;
-+              d2i_ASN1_SET_OF_POLICYQUALINFO;
-+              i2d_ASN1_SET_OF_POLICYQUALINFO;
-+              d2i_ASN1_SET_OF_POLICYINFO;
-+              i2d_ASN1_SET_OF_POLICYINFO;
-+              SXNET_add_id_asc;
-+              SXNET_add_id_ulong;
-+              SXNET_add_id_INTEGER;
-+              SXNET_get_id_asc;
-+              SXNET_get_id_ulong;
-+              SXNET_get_id_INTEGER;
-+              X509V3_set_conf_lhash;
-+              i2d_CERTIFICATEPOLICIES;
-+              CERTIFICATEPOLICIES_new;
-+              CERTIFICATEPOLICIES_free;
-+              d2i_CERTIFICATEPOLICIES;
-+              i2d_POLICYINFO;
-+              POLICYINFO_new;
-+              d2i_POLICYINFO;
-+              POLICYINFO_free;
-+              i2d_POLICYQUALINFO;
-+              POLICYQUALINFO_new;
-+              d2i_POLICYQUALINFO;
-+              POLICYQUALINFO_free;
-+              i2d_USERNOTICE;
-+              USERNOTICE_new;
-+              d2i_USERNOTICE;
-+              USERNOTICE_free;
-+              i2d_NOTICEREF;
-+              NOTICEREF_new;
-+              d2i_NOTICEREF;
-+              NOTICEREF_free;
-+              X509V3_get_string;
-+              X509V3_get_section;
-+              X509V3_string_free;
-+              X509V3_section_free;
-+              X509V3_set_ctx;
-+              s2i_ASN1_INTEGER;
-+              CRYPTO_set_locked_mem_functions;
-+              CRYPTO_get_locked_mem_functions;
-+              CRYPTO_malloc_locked;
-+              CRYPTO_free_locked;
-+              BN_mod_exp2_mont;
-+              ERR_get_error_line_data;
-+              ERR_peek_error_line_data;
-+              PKCS12_PBE_keyivgen;
-+              X509_ALGOR_dup;
-+              d2i_ASN1_SET_OF_DIST_POINT;
-+              i2d_ASN1_SET_OF_DIST_POINT;
-+              i2d_CRL_DIST_POINTS;
-+              CRL_DIST_POINTS_new;
-+              CRL_DIST_POINTS_free;
-+              d2i_CRL_DIST_POINTS;
-+              i2d_DIST_POINT;
-+              DIST_POINT_new;
-+              d2i_DIST_POINT;
-+              DIST_POINT_free;
-+              i2d_DIST_POINT_NAME;
-+              DIST_POINT_NAME_new;
-+              DIST_POINT_NAME_free;
-+              d2i_DIST_POINT_NAME;
-+              X509V3_add_value_uchar;
-+              d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_ASN1_TYPE;
-+              d2i_ASN1_SET_OF_X509_EXTENSION;
-+              d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+              d2i_ASN1_SET_OF_ASN1_TYPE;
-+              i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_X509_EXTENSION;
-+              i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+              X509V3_EXT_i2d;
-+              X509V3_EXT_val_prn;
-+              X509V3_EXT_add_list;
-+              EVP_CIPHER_type;
-+              EVP_PBE_CipherInit;
-+              X509V3_add_value_bool_nf;
-+              d2i_ASN1_UINTEGER;
-+              sk_value;
-+              sk_num;
-+              sk_set;
-+              i2d_ASN1_SET_OF_X509_REVOKED;
-+              sk_sort;
-+              d2i_ASN1_SET_OF_X509_REVOKED;
-+              i2d_ASN1_SET_OF_X509_ALGOR;
-+              i2d_ASN1_SET_OF_X509_CRL;
-+              d2i_ASN1_SET_OF_X509_ALGOR;
-+              d2i_ASN1_SET_OF_X509_CRL;
-+              i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              PKCS5_PBE_add;
-+              PEM_write_bio_PKCS8;
-+              i2d_PKCS8_fp;
-+              PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_bio_P8_PRIV_KEY_INFO;
-+              d2i_PKCS8_bio;
-+              d2i_PKCS8_PRIV_KEY_INFO_fp;
-+              PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_bio_P8_PRIV_KEY_INFO;
-+              PEM_read_PKCS8;
-+              d2i_PKCS8_PRIV_KEY_INFO_bio;
-+              d2i_PKCS8_fp;
-+              PEM_write_PKCS8;
-+              PEM_read_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_P8_PRIV_KEY_INFO;
-+              PEM_read_bio_PKCS8;
-+              PEM_write_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_P8_PRIV_KEY_INFO;
-+              PKCS5_PBE_keyivgen;
-+              i2d_PKCS8_bio;
-+              i2d_PKCS8_PRIV_KEY_INFO_fp;
-+              i2d_PKCS8_PRIV_KEY_INFO_bio;
-+              BIO_s_bio;
-+              PKCS5_pbe2_set;
-+              PKCS5_PBKDF2_HMAC_SHA1;
-+              PKCS5_v2_PBE_keyivgen;
-+              PEM_write_bio_PKCS8PrivateKey;
-+              PEM_write_PKCS8PrivateKey;
-+              BIO_ctrl_get_read_request;
-+              BIO_ctrl_pending;
-+              BIO_ctrl_wpending;
-+              BIO_new_bio_pair;
-+              BIO_ctrl_get_write_guarantee;
-+              CRYPTO_num_locks;
-+              CONF_load_bio;
-+              CONF_load_fp;
-+              i2d_ASN1_SET_OF_ASN1_OBJECT;
-+              d2i_ASN1_SET_OF_ASN1_OBJECT;
-+              PKCS7_signatureVerify;
-+              RSA_set_method;
-+              RSA_get_method;
-+              RSA_get_default_method;
-+              RSA_check_key;
-+              OBJ_obj2txt;
-+              DSA_dup_DH;
-+              X509_REQ_get_extensions;
-+              X509_REQ_set_extension_nids;
-+              BIO_nwrite;
-+              X509_REQ_extension_nid;
-+              BIO_nread;
-+              X509_REQ_get_extension_nids;
-+              BIO_nwrite0;
-+              X509_REQ_add_extensions_nid;
-+              BIO_nread0;
-+              X509_REQ_add_extensions;
-+              BIO_new_mem_buf;
-+              DH_set_ex_data;
-+              DH_set_method;
-+              DSA_OpenSSL;
-+              DH_get_ex_data;
-+              DH_get_ex_new_index;
-+              DSA_new_method;
-+              DH_new_method;
-+              DH_OpenSSL;
-+              DSA_get_ex_new_index;
-+              DH_get_default_method;
-+              DSA_set_ex_data;
-+              DH_set_default_method;
-+              DSA_get_ex_data;
-+              X509V3_EXT_REQ_add_conf;
-+              NETSCAPE_SPKI_print;
-+              NETSCAPE_SPKI_set_pubkey;
-+              NETSCAPE_SPKI_b64_encode;
-+              NETSCAPE_SPKI_get_pubkey;
-+              NETSCAPE_SPKI_b64_decode;
-+              UTF8_putc;
-+              UTF8_getc;
-+              RSA_null_method;
-+              ASN1_tag2str;
-+              BIO_ctrl_reset_read_request;
-+              DISPLAYTEXT_new;
-+              ASN1_GENERALIZEDTIME_free;
-+              X509_REVOKED_get_ext_d2i;
-+              X509_set_ex_data;
-+              X509_reject_set_bit_asc;
-+              X509_NAME_add_entry_by_txt;
-+              X509_NAME_add_entry_by_NID;
-+              X509_PURPOSE_get0;
-+              PEM_read_X509_AUX;
-+              d2i_AUTHORITY_INFO_ACCESS;
-+              PEM_write_PUBKEY;
-+              ACCESS_DESCRIPTION_new;
-+              X509_CERT_AUX_free;
-+              d2i_ACCESS_DESCRIPTION;
-+              X509_trust_clear;
-+              X509_TRUST_add;
-+              ASN1_VISIBLESTRING_new;
-+              X509_alias_set1;
-+              ASN1_PRINTABLESTRING_free;
-+              EVP_PKEY_get1_DSA;
-+              ASN1_BMPSTRING_new;
-+              ASN1_mbstring_copy;
-+              ASN1_UTF8STRING_new;
-+              DSA_get_default_method;
-+              i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_T61STRING_free;
-+              DSA_set_method;
-+              X509_get_ex_data;
-+              ASN1_STRING_type;
-+              X509_PURPOSE_get_by_sname;
-+              ASN1_TIME_free;
-+              ASN1_OCTET_STRING_cmp;
-+              ASN1_BIT_STRING_new;
-+              X509_get_ext_d2i;
-+              PEM_read_bio_X509_AUX;
-+              ASN1_STRING_set_default_mask_asc;
-+              ASN1_STRING_set_def_mask_asc;
-+              PEM_write_bio_RSA_PUBKEY;
-+              ASN1_INTEGER_cmp;
-+              d2i_RSA_PUBKEY_fp;
-+              X509_trust_set_bit_asc;
-+              PEM_write_bio_DSA_PUBKEY;
-+              X509_STORE_CTX_free;
-+              EVP_PKEY_set1_DSA;
-+              i2d_DSA_PUBKEY_fp;
-+              X509_load_cert_crl_file;
-+              ASN1_TIME_new;
-+              i2d_RSA_PUBKEY;
-+              X509_STORE_CTX_purpose_inherit;
-+              PEM_read_RSA_PUBKEY;
-+              d2i_X509_AUX;
-+              i2d_DSA_PUBKEY;
-+              X509_CERT_AUX_print;
-+              PEM_read_DSA_PUBKEY;
-+              i2d_RSA_PUBKEY_bio;
-+              ASN1_BIT_STRING_num_asc;
-+              i2d_PUBKEY;
-+              ASN1_UTCTIME_free;
-+              DSA_set_default_method;
-+              X509_PURPOSE_get_by_id;
-+              ACCESS_DESCRIPTION_free;
-+              PEM_read_bio_PUBKEY;
-+              ASN1_STRING_set_by_NID;
-+              X509_PURPOSE_get_id;
-+              DISPLAYTEXT_free;
-+              OTHERNAME_new;
-+              X509_CERT_AUX_new;
-+              X509_TRUST_cleanup;
-+              X509_NAME_add_entry_by_OBJ;
-+              X509_CRL_get_ext_d2i;
-+              X509_PURPOSE_get0_name;
-+              PEM_read_PUBKEY;
-+              i2d_DSA_PUBKEY_bio;
-+              i2d_OTHERNAME;
-+              ASN1_OCTET_STRING_free;
-+              ASN1_BIT_STRING_set_asc;
-+              X509_get_ex_new_index;
-+              ASN1_STRING_TABLE_cleanup;
-+              X509_TRUST_get_by_id;
-+              X509_PURPOSE_get_trust;
-+              ASN1_STRING_length;
-+              d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_PRINTABLESTRING_new;
-+              X509V3_get_d2i;
-+              ASN1_ENUMERATED_free;
-+              i2d_X509_CERT_AUX;
-+              X509_STORE_CTX_set_trust;
-+              ASN1_STRING_set_default_mask;
-+              X509_STORE_CTX_new;
-+              EVP_PKEY_get1_RSA;
-+              DIRECTORYSTRING_free;
-+              PEM_write_X509_AUX;
-+              ASN1_OCTET_STRING_set;
-+              d2i_DSA_PUBKEY_fp;
-+              d2i_RSA_PUBKEY;
-+              X509_TRUST_get0_name;
-+              X509_TRUST_get0;
-+              AUTHORITY_INFO_ACCESS_free;
-+              ASN1_IA5STRING_new;
-+              d2i_DSA_PUBKEY;
-+              X509_check_purpose;
-+              ASN1_ENUMERATED_new;
-+              d2i_RSA_PUBKEY_bio;
-+              d2i_PUBKEY;
-+              X509_TRUST_get_trust;
-+              X509_TRUST_get_flags;
-+              ASN1_BMPSTRING_free;
-+              ASN1_T61STRING_new;
-+              ASN1_UTCTIME_new;
-+              i2d_AUTHORITY_INFO_ACCESS;
-+              EVP_PKEY_set1_RSA;
-+              X509_STORE_CTX_set_purpose;
-+              ASN1_IA5STRING_free;
-+              PEM_write_bio_X509_AUX;
-+              X509_PURPOSE_get_count;
-+              CRYPTO_add_info;
-+              X509_NAME_ENTRY_create_by_txt;
-+              ASN1_STRING_get_default_mask;
-+              X509_alias_get0;
-+              ASN1_STRING_data;
-+              i2d_ACCESS_DESCRIPTION;
-+              X509_trust_set_bit;
-+              ASN1_BIT_STRING_free;
-+              PEM_read_bio_RSA_PUBKEY;
-+              X509_add1_reject_object;
-+              X509_check_trust;
-+              PEM_read_bio_DSA_PUBKEY;
-+              X509_PURPOSE_add;
-+              ASN1_STRING_TABLE_get;
-+              ASN1_UTF8STRING_free;
-+              d2i_DSA_PUBKEY_bio;
-+              PEM_write_RSA_PUBKEY;
-+              d2i_OTHERNAME;
-+              X509_reject_set_bit;
-+              PEM_write_DSA_PUBKEY;
-+              X509_PURPOSE_get0_sname;
-+              EVP_PKEY_set1_DH;
-+              ASN1_OCTET_STRING_dup;
-+              ASN1_BIT_STRING_set;
-+              X509_TRUST_get_count;
-+              ASN1_INTEGER_free;
-+              OTHERNAME_free;
-+              i2d_RSA_PUBKEY_fp;
-+              ASN1_INTEGER_dup;
-+              d2i_X509_CERT_AUX;
-+              PEM_write_bio_PUBKEY;
-+              ASN1_VISIBLESTRING_free;
-+              X509_PURPOSE_cleanup;
-+              ASN1_mbstring_ncopy;
-+              ASN1_GENERALIZEDTIME_new;
-+              EVP_PKEY_get1_DH;
-+              ASN1_OCTET_STRING_new;
-+              ASN1_INTEGER_new;
-+              i2d_X509_AUX;
-+              ASN1_BIT_STRING_name_print;
-+              X509_cmp;
-+              ASN1_STRING_length_set;
-+              DIRECTORYSTRING_new;
-+              X509_add1_trust_object;
-+              PKCS12_newpass;
-+              SMIME_write_PKCS7;
-+              SMIME_read_PKCS7;
-+              DES_set_key_checked;
-+              PKCS7_verify;
-+              PKCS7_encrypt;
-+              DES_set_key_unchecked;
-+              SMIME_crlf_copy;
-+              i2d_ASN1_PRINTABLESTRING;
-+              PKCS7_get0_signers;
-+              PKCS7_decrypt;
-+              SMIME_text;
-+              PKCS7_simple_smimecap;
-+              PKCS7_get_smimecap;
-+              PKCS7_sign;
-+              PKCS7_add_attrib_smimecap;
-+              CRYPTO_dbg_set_options;
-+              CRYPTO_remove_all_info;
-+              CRYPTO_get_mem_debug_functions;
-+              CRYPTO_is_mem_check_on;
-+              CRYPTO_set_mem_debug_functions;
-+              CRYPTO_pop_info;
-+              CRYPTO_push_info_;
-+              CRYPTO_set_mem_debug_options;
-+              PEM_write_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivKey_nid;
-+              d2i_PKCS8PrivateKey_bio;
-+              ASN1_NULL_free;
-+              d2i_ASN1_NULL;
-+              ASN1_NULL_new;
-+              i2d_PKCS8PrivateKey_bio;
-+              i2d_PKCS8PrivateKey_fp;
-+              i2d_ASN1_NULL;
-+              i2d_PKCS8PrivateKey_nid_fp;
-+              d2i_PKCS8PrivateKey_fp;
-+              i2d_PKCS8PrivateKey_nid_bio;
-+              i2d_PKCS8PrivateKeyInfo_fp;
-+              i2d_PKCS8PrivateKeyInfo_bio;
-+              PEM_cb;
-+              i2d_PrivateKey_fp;
-+              d2i_PrivateKey_bio;
-+              d2i_PrivateKey_fp;
-+              i2d_PrivateKey_bio;
-+              X509_reject_clear;
-+              X509_TRUST_set_default;
-+              d2i_AutoPrivateKey;
-+              X509_ATTRIBUTE_get0_type;
-+              X509_ATTRIBUTE_set1_data;
-+              X509at_get_attr;
-+              X509at_get_attr_count;
-+              X509_ATTRIBUTE_create_by_NID;
-+              X509_ATTRIBUTE_set1_object;
-+              X509_ATTRIBUTE_count;
-+              X509_ATTRIBUTE_create_by_OBJ;
-+              X509_ATTRIBUTE_get0_object;
-+              X509at_get_attr_by_NID;
-+              X509at_add1_attr;
-+              X509_ATTRIBUTE_get0_data;
-+              X509at_delete_attr;
-+              X509at_get_attr_by_OBJ;
-+              RAND_add;
-+              BIO_number_written;
-+              BIO_number_read;
-+              X509_STORE_CTX_get1_chain;
-+              ERR_load_RAND_strings;
-+              RAND_pseudo_bytes;
-+              X509_REQ_get_attr_by_NID;
-+              X509_REQ_get_attr;
-+              X509_REQ_add1_attr_by_NID;
-+              X509_REQ_get_attr_by_OBJ;
-+              X509at_add1_attr_by_NID;
-+              X509_REQ_add1_attr_by_OBJ;
-+              X509_REQ_get_attr_count;
-+              X509_REQ_add1_attr;
-+              X509_REQ_delete_attr;
-+              X509at_add1_attr_by_OBJ;
-+              X509_REQ_add1_attr_by_txt;
-+              X509_ATTRIBUTE_create_by_txt;
-+              X509at_add1_attr_by_txt;
-+              BN_pseudo_rand;
-+              BN_is_prime_fasttest;
-+              BN_CTX_end;
-+              BN_CTX_start;
-+              BN_CTX_get;
-+              EVP_PKEY2PKCS8_broken;
-+              ASN1_STRING_TABLE_add;
-+              CRYPTO_dbg_get_options;
-+              AUTHORITY_INFO_ACCESS_new;
-+              CRYPTO_get_mem_debug_options;
-+              DES_crypt;
-+              PEM_write_bio_X509_REQ_NEW;
-+              PEM_write_X509_REQ_NEW;
-+              BIO_callback_ctrl;
-+              RAND_egd;
-+              RAND_status;
-+              bn_dump1;
-+              DES_check_key_parity;
-+              lh_num_items;
-+              RAND_event;
-+              DSO_new;
-+              DSO_new_method;
-+              DSO_free;
-+              DSO_flags;
-+              DSO_up;
-+              DSO_set_default_method;
-+              DSO_get_default_method;
-+              DSO_get_method;
-+              DSO_set_method;
-+              DSO_load;
-+              DSO_bind_var;
-+              DSO_METHOD_null;
-+              DSO_METHOD_openssl;
-+              DSO_METHOD_dlfcn;
-+              DSO_METHOD_win32;
-+              ERR_load_DSO_strings;
-+              DSO_METHOD_dl;
-+              NCONF_load;
-+              NCONF_load_fp;
-+              NCONF_new;
-+              NCONF_get_string;
-+              NCONF_free;
-+              NCONF_get_number;
-+              CONF_dump_fp;
-+              NCONF_load_bio;
-+              NCONF_dump_fp;
-+              NCONF_get_section;
-+              NCONF_dump_bio;
-+              CONF_dump_bio;
-+              NCONF_free_data;
-+              CONF_set_default_method;
-+              ERR_error_string_n;
-+              BIO_snprintf;
-+              DSO_ctrl;
-+              i2d_ASN1_SET_OF_ASN1_INTEGER;
-+              i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              i2d_ASN1_SET_OF_PKCS7;
-+              BIO_vfree;
-+              d2i_ASN1_SET_OF_ASN1_INTEGER;
-+              d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              ASN1_UTCTIME_get;
-+              X509_REQ_digest;
-+              X509_CRL_digest;
-+              d2i_ASN1_SET_OF_PKCS7;
-+              EVP_CIPHER_CTX_set_key_length;
-+              EVP_CIPHER_CTX_ctrl;
-+              BN_mod_exp_mont_word;
-+              RAND_egd_bytes;
-+              X509_REQ_get1_email;
-+              X509_get1_email;
-+              X509_email_free;
-+              i2d_RSA_NET;
-+              d2i_RSA_NET_2;
-+              d2i_RSA_NET;
-+              DSO_bind_func;
-+              CRYPTO_get_new_dynlockid;
-+              sk_new_null;
-+              CRYPTO_set_dynlock_destroy_callback;
-+              CRYPTO_set_dynlock_destroy_cb;
-+              CRYPTO_destroy_dynlockid;
-+              CRYPTO_set_dynlock_size;
-+              CRYPTO_set_dynlock_create_callback;
-+              CRYPTO_set_dynlock_create_cb;
-+              CRYPTO_set_dynlock_lock_callback;
-+              CRYPTO_set_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_lock_callback;
-+              CRYPTO_get_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_destroy_callback;
-+              CRYPTO_get_dynlock_destroy_cb;
-+              CRYPTO_get_dynlock_value;
-+              CRYPTO_get_dynlock_create_callback;
-+              CRYPTO_get_dynlock_create_cb;
-+              c2i_ASN1_BIT_STRING;
-+              i2c_ASN1_BIT_STRING;
-+              RAND_poll;
-+              c2i_ASN1_INTEGER;
-+              i2c_ASN1_INTEGER;
-+              BIO_dump_indent;
-+              ASN1_parse_dump;
-+              c2i_ASN1_OBJECT;
-+              X509_NAME_print_ex_fp;
-+              ASN1_STRING_print_ex_fp;
-+              X509_NAME_print_ex;
-+              ASN1_STRING_print_ex;
-+              MD4;
-+              MD4_Transform;
-+              MD4_Final;
-+              MD4_Update;
-+              MD4_Init;
-+              EVP_md4;
-+              i2d_PUBKEY_bio;
-+              i2d_PUBKEY_fp;
-+              d2i_PUBKEY_bio;
-+              ASN1_STRING_to_UTF8;
-+              BIO_vprintf;
-+              BIO_vsnprintf;
-+              d2i_PUBKEY_fp;
-+              X509_cmp_time;
-+              X509_STORE_CTX_set_time;
-+              X509_STORE_CTX_get1_issuer;
-+              X509_OBJECT_retrieve_match;
-+              X509_OBJECT_idx_by_subject;
-+              X509_STORE_CTX_set_flags;
-+              X509_STORE_CTX_trusted_stack;
-+              X509_time_adj;
-+              X509_check_issued;
-+              ASN1_UTCTIME_cmp_time_t;
-+              DES_set_weak_key_flag;
-+              DES_check_key;
-+              DES_rw_mode;
-+              RSA_PKCS1_RSAref;
-+              X509_keyid_set1;
-+              BIO_next;
-+              DSO_METHOD_vms;
-+              BIO_f_linebuffer;
-+              BN_bntest_rand;
-+              OPENSSL_issetugid;
-+              BN_rand_range;
-+              ERR_load_ENGINE_strings;
-+              ENGINE_set_DSA;
-+              ENGINE_get_finish_function;
-+              ENGINE_get_default_RSA;
-+              ENGINE_get_BN_mod_exp;
-+              DSA_get_default_openssl_method;
-+              ENGINE_set_DH;
-+              ENGINE_set_def_BN_mod_exp_crt;
-+              ENGINE_set_default_BN_mod_exp_crt;
-+              ENGINE_init;
-+              DH_get_default_openssl_method;
-+              RSA_set_default_openssl_method;
-+              ENGINE_finish;
-+              ENGINE_load_public_key;
-+              ENGINE_get_DH;
-+              ENGINE_ctrl;
-+              ENGINE_get_init_function;
-+              ENGINE_set_init_function;
-+              ENGINE_set_default_DSA;
-+              ENGINE_get_name;
-+              ENGINE_get_last;
-+              ENGINE_get_prev;
-+              ENGINE_get_default_DH;
-+              ENGINE_get_RSA;
-+              ENGINE_set_default;
-+              ENGINE_get_RAND;
-+              ENGINE_get_first;
-+              ENGINE_by_id;
-+              ENGINE_set_finish_function;
-+              ENGINE_get_def_BN_mod_exp_crt;
-+              ENGINE_get_default_BN_mod_exp_crt;
-+              RSA_get_default_openssl_method;
-+              ENGINE_set_RSA;
-+              ENGINE_load_private_key;
-+              ENGINE_set_default_RAND;
-+              ENGINE_set_BN_mod_exp;
-+              ENGINE_remove;
-+              ENGINE_free;
-+              ENGINE_get_BN_mod_exp_crt;
-+              ENGINE_get_next;
-+              ENGINE_set_name;
-+              ENGINE_get_default_DSA;
-+              ENGINE_set_default_BN_mod_exp;
-+              ENGINE_set_default_RSA;
-+              ENGINE_get_default_RAND;
-+              ENGINE_get_default_BN_mod_exp;
-+              ENGINE_set_RAND;
-+              ENGINE_set_id;
-+              ENGINE_set_BN_mod_exp_crt;
-+              ENGINE_set_default_DH;
-+              ENGINE_new;
-+              ENGINE_get_id;
-+              DSA_set_default_openssl_method;
-+              ENGINE_add;
-+              DH_set_default_openssl_method;
-+              ENGINE_get_DSA;
-+              ENGINE_get_ctrl_function;
-+              ENGINE_set_ctrl_function;
-+              BN_pseudo_rand_range;
-+              X509_STORE_CTX_set_verify_cb;
-+              ERR_load_COMP_strings;
-+              PKCS12_item_decrypt_d2i;
-+              ASN1_UTF8STRING_it;
-+              ENGINE_unregister_ciphers;
-+              ENGINE_get_ciphers;
-+              d2i_OCSP_BASICRESP;
-+              KRB5_CHECKSUM_it;
-+              EC_POINT_add;
-+              ASN1_item_ex_i2d;
-+              OCSP_CERTID_it;
-+              d2i_OCSP_RESPBYTES;
-+              X509V3_add1_i2d;
-+              PKCS7_ENVELOPE_it;
-+              UI_add_input_boolean;
-+              ENGINE_unregister_RSA;
-+              X509V3_EXT_nconf;
-+              ASN1_GENERALSTRING_free;
-+              d2i_OCSP_CERTSTATUS;
-+              X509_REVOKED_set_serialNumber;
-+              X509_print_ex;
-+              OCSP_ONEREQ_get1_ext_d2i;
-+              ENGINE_register_all_RAND;
-+              ENGINE_load_dynamic;
-+              PBKDF2PARAM_it;
-+              EXTENDED_KEY_USAGE_new;
-+              EC_GROUP_clear_free;
-+              OCSP_sendreq_bio;
-+              ASN1_item_digest;
-+              OCSP_BASICRESP_delete_ext;
-+              OCSP_SIGNATURE_it;
-+              X509_CRL_it;
-+              OCSP_BASICRESP_add_ext;
-+              KRB5_ENCKEY_it;
-+              UI_method_set_closer;
-+              X509_STORE_set_purpose;
-+              i2d_ASN1_GENERALSTRING;
-+              OCSP_response_status;
-+              i2d_OCSP_SERVICELOC;
-+              ENGINE_get_digest_engine;
-+              EC_GROUP_set_curve_GFp;
-+              OCSP_REQUEST_get_ext_by_OBJ;
-+              _ossl_old_des_random_key;
-+              ASN1_T61STRING_it;
-+              EC_GROUP_method_of;
-+              i2d_KRB5_APREQ;
-+              _ossl_old_des_encrypt;
-+              ASN1_PRINTABLE_new;
-+              HMAC_Init_ex;
-+              d2i_KRB5_AUTHENT;
-+              OCSP_archive_cutoff_new;
-+              EC_POINT_set_Jprojective_coordinates_GFp;
-+              EC_POINT_set_Jproj_coords_GFp;
-+              _ossl_old_des_is_weak_key;
-+              OCSP_BASICRESP_get_ext_by_OBJ;
-+              EC_POINT_oct2point;
-+              OCSP_SINGLERESP_get_ext_count;
-+              UI_ctrl;
-+              _shadow_DES_rw_mode;
-+              asn1_do_adb;
-+              ASN1_template_i2d;
-+              ENGINE_register_DH;
-+              UI_construct_prompt;
-+              X509_STORE_set_trust;
-+              UI_dup_input_string;
-+              d2i_KRB5_APREQ;
-+              EVP_MD_CTX_copy_ex;
-+              OCSP_request_is_signed;
-+              i2d_OCSP_REQINFO;
-+              KRB5_ENCKEY_free;
-+              OCSP_resp_get0;
-+              GENERAL_NAME_it;
-+              ASN1_GENERALIZEDTIME_it;
-+              X509_STORE_set_flags;
-+              EC_POINT_set_compressed_coordinates_GFp;
-+              EC_POINT_set_compr_coords_GFp;
-+              OCSP_response_status_str;
-+              d2i_OCSP_REVOKEDINFO;
-+              OCSP_basic_add1_cert;
-+              ERR_get_implementation;
-+              EVP_CipherFinal_ex;
-+              OCSP_CERTSTATUS_new;
-+              CRYPTO_cleanup_all_ex_data;
-+              OCSP_resp_find;
-+              BN_nnmod;
-+              X509_CRL_sort;
-+              X509_REVOKED_set_revocationDate;
-+              ENGINE_register_RAND;
-+              OCSP_SERVICELOC_new;
-+              EC_POINT_set_affine_coordinates_GFp;
-+              EC_POINT_set_affine_coords_GFp;
-+              _ossl_old_des_options;
-+              SXNET_it;
-+              UI_dup_input_boolean;
-+              PKCS12_add_CSPName_asc;
-+              EC_POINT_is_at_infinity;
-+              ENGINE_load_cryptodev;
-+              DSO_convert_filename;
-+              POLICYQUALINFO_it;
-+              ENGINE_register_ciphers;
-+              BN_mod_lshift_quick;
-+              DSO_set_filename;
-+              ASN1_item_free;
-+              KRB5_TKTBODY_free;
-+              AUTHORITY_KEYID_it;
-+              KRB5_APREQBODY_new;
-+              X509V3_EXT_REQ_add_nconf;
-+              ENGINE_ctrl_cmd_string;
-+              i2d_OCSP_RESPDATA;
-+              EVP_MD_CTX_init;
-+              EXTENDED_KEY_USAGE_free;
-+              PKCS7_ATTR_SIGN_it;
-+              UI_add_error_string;
-+              KRB5_CHECKSUM_free;
-+              OCSP_REQUEST_get_ext;
-+              ENGINE_load_ubsec;
-+              ENGINE_register_all_digests;
-+              PKEY_USAGE_PERIOD_it;
-+              PKCS12_unpack_authsafes;
-+              ASN1_item_unpack;
-+              NETSCAPE_SPKAC_it;
-+              X509_REVOKED_it;
-+              ASN1_STRING_encode;
-+              EVP_aes_128_ecb;
-+              KRB5_AUTHENT_free;
-+              OCSP_BASICRESP_get_ext_by_critical;
-+              OCSP_BASICRESP_get_ext_by_crit;
-+              OCSP_cert_status_str;
-+              d2i_OCSP_REQUEST;
-+              UI_dup_info_string;
-+              _ossl_old_des_xwhite_in2out;
-+              PKCS12_it;
-+              OCSP_SINGLERESP_get_ext_by_critical;
-+              OCSP_SINGLERESP_get_ext_by_crit;
-+              OCSP_CERTSTATUS_free;
-+              _ossl_old_des_crypt;
-+              ASN1_item_i2d;
-+              EVP_DecryptFinal_ex;
-+              ENGINE_load_openssl;
-+              ENGINE_get_cmd_defns;
-+              ENGINE_set_load_privkey_function;
-+              ENGINE_set_load_privkey_fn;
-+              EVP_EncryptFinal_ex;
-+              ENGINE_set_default_digests;
-+              X509_get0_pubkey_bitstr;
-+              asn1_ex_i2c;
-+              ENGINE_register_RSA;
-+              ENGINE_unregister_DSA;
-+              _ossl_old_des_key_sched;
-+              X509_EXTENSION_it;
-+              i2d_KRB5_AUTHENT;
-+              SXNETID_it;
-+              d2i_OCSP_SINGLERESP;
-+              EDIPARTYNAME_new;
-+              PKCS12_certbag2x509;
-+              _ossl_old_des_ofb64_encrypt;
-+              d2i_EXTENDED_KEY_USAGE;
-+              ERR_print_errors_cb;
-+              ENGINE_set_ciphers;
-+              d2i_KRB5_APREQBODY;
-+              UI_method_get_flusher;
-+              X509_PUBKEY_it;
-+              _ossl_old_des_enc_read;
-+              PKCS7_ENCRYPT_it;
-+              i2d_OCSP_RESPONSE;
-+              EC_GROUP_get_cofactor;
-+              PKCS12_unpack_p7data;
-+              d2i_KRB5_AUTHDATA;
-+              OCSP_copy_nonce;
-+              KRB5_AUTHDATA_new;
-+              OCSP_RESPDATA_new;
-+              EC_GFp_mont_method;
-+              OCSP_REVOKEDINFO_free;
-+              UI_get_ex_data;
-+              KRB5_APREQBODY_free;
-+              EC_GROUP_get0_generator;
-+              UI_get_default_method;
-+              X509V3_set_nconf;
-+              PKCS12_item_i2d_encrypt;
-+              X509_add1_ext_i2d;
-+              PKCS7_SIGNER_INFO_it;
-+              KRB5_PRINCNAME_new;
-+              PKCS12_SAFEBAG_it;
-+              EC_GROUP_get_order;
-+              d2i_OCSP_RESPID;
-+              OCSP_request_verify;
-+              NCONF_get_number_e;
-+              _ossl_old_des_decrypt3;
-+              X509_signature_print;
-+              OCSP_SINGLERESP_free;
-+              ENGINE_load_builtin_engines;
-+              i2d_OCSP_ONEREQ;
-+              OCSP_REQUEST_add_ext;
-+              OCSP_RESPBYTES_new;
-+              EVP_MD_CTX_create;
-+              OCSP_resp_find_status;
-+              X509_ALGOR_it;
-+              ASN1_TIME_it;
-+              OCSP_request_set1_name;
-+              OCSP_ONEREQ_get_ext_count;
-+              UI_get0_result;
-+              PKCS12_AUTHSAFES_it;
-+              EVP_aes_256_ecb;
-+              PKCS12_pack_authsafes;
-+              ASN1_IA5STRING_it;
-+              UI_get_input_flags;
-+              EC_GROUP_set_generator;
-+              _ossl_old_des_string_to_2keys;
-+              OCSP_CERTID_free;
-+              X509_CERT_AUX_it;
-+              CERTIFICATEPOLICIES_it;
-+              _ossl_old_des_ede3_cbc_encrypt;
-+              RAND_set_rand_engine;
-+              DSO_get_loaded_filename;
-+              X509_ATTRIBUTE_it;
-+              OCSP_ONEREQ_get_ext_by_NID;
-+              PKCS12_decrypt_skey;
-+              KRB5_AUTHENT_it;
-+              UI_dup_error_string;
-+              RSAPublicKey_it;
-+              i2d_OCSP_REQUEST;
-+              PKCS12_x509crl2certbag;
-+              OCSP_SERVICELOC_it;
-+              ASN1_item_sign;
-+              X509_CRL_set_issuer_name;
-+              OBJ_NAME_do_all_sorted;
-+              i2d_OCSP_BASICRESP;
-+              i2d_OCSP_RESPBYTES;
-+              PKCS12_unpack_p7encdata;
-+              HMAC_CTX_init;
-+              ENGINE_get_digest;
-+              OCSP_RESPONSE_print;
-+              KRB5_TKTBODY_it;
-+              ACCESS_DESCRIPTION_it;
-+              PKCS7_ISSUER_AND_SERIAL_it;
-+              PBE2PARAM_it;
-+              PKCS12_certbag2x509crl;
-+              PKCS7_SIGNED_it;
-+              ENGINE_get_cipher;
-+              i2d_OCSP_CRLID;
-+              OCSP_SINGLERESP_new;
-+              ENGINE_cmd_is_executable;
-+              RSA_up_ref;
-+              ASN1_GENERALSTRING_it;
-+              ENGINE_register_DSA;
-+              X509V3_EXT_add_nconf_sk;
-+              ENGINE_set_load_pubkey_function;
-+              PKCS8_decrypt;
-+              PEM_bytes_read_bio;
-+              DIRECTORYSTRING_it;
-+              d2i_OCSP_CRLID;
-+              EC_POINT_is_on_curve;
-+              CRYPTO_set_locked_mem_ex_functions;
-+              CRYPTO_set_locked_mem_ex_funcs;
-+              d2i_KRB5_CHECKSUM;
-+              ASN1_item_dup;
-+              X509_it;
-+              BN_mod_add;
-+              KRB5_AUTHDATA_free;
-+              _ossl_old_des_cbc_cksum;
-+              ASN1_item_verify;
-+              CRYPTO_set_mem_ex_functions;
-+              EC_POINT_get_Jprojective_coordinates_GFp;
-+              EC_POINT_get_Jproj_coords_GFp;
-+              ZLONG_it;
-+              CRYPTO_get_locked_mem_ex_functions;
-+              CRYPTO_get_locked_mem_ex_funcs;
-+              ASN1_TIME_check;
-+              UI_get0_user_data;
-+              HMAC_CTX_cleanup;
-+              DSA_up_ref;
-+              _ossl_old_des_ede3_cfb64_encrypt;
-+              _ossl_odes_ede3_cfb64_encrypt;
-+              ASN1_BMPSTRING_it;
-+              ASN1_tag2bit;
-+              UI_method_set_flusher;
-+              X509_ocspid_print;
-+              KRB5_ENCDATA_it;
-+              ENGINE_get_load_pubkey_function;
-+              UI_add_user_data;
-+              OCSP_REQUEST_delete_ext;
-+              UI_get_method;
-+              OCSP_ONEREQ_free;
-+              ASN1_PRINTABLESTRING_it;
-+              X509_CRL_set_nextUpdate;
-+              OCSP_REQUEST_it;
-+              OCSP_BASICRESP_it;
-+              AES_ecb_encrypt;
-+              BN_mod_sqr;
-+              NETSCAPE_CERT_SEQUENCE_it;
-+              GENERAL_NAMES_it;
-+              AUTHORITY_INFO_ACCESS_it;
-+              ASN1_FBOOLEAN_it;
-+              UI_set_ex_data;
-+              _ossl_old_des_string_to_key;
-+              ENGINE_register_all_RSA;
-+              d2i_KRB5_PRINCNAME;
-+              OCSP_RESPBYTES_it;
-+              X509_CINF_it;
-+              ENGINE_unregister_digests;
-+              d2i_EDIPARTYNAME;
-+              d2i_OCSP_SERVICELOC;
-+              ENGINE_get_digests;
-+              _ossl_old_des_set_odd_parity;
-+              OCSP_RESPDATA_free;
-+              d2i_KRB5_TICKET;
-+              OTHERNAME_it;
-+              EVP_MD_CTX_cleanup;
-+              d2i_ASN1_GENERALSTRING;
-+              X509_CRL_set_version;
-+              BN_mod_sub;
-+              OCSP_SINGLERESP_get_ext_by_NID;
-+              ENGINE_get_ex_new_index;
-+              OCSP_REQUEST_free;
-+              OCSP_REQUEST_add1_ext_i2d;
-+              X509_VAL_it;
-+              EC_POINTs_make_affine;
-+              EC_POINT_mul;
-+              X509V3_EXT_add_nconf;
-+              X509_TRUST_set;
-+              X509_CRL_add1_ext_i2d;
-+              _ossl_old_des_fcrypt;
-+              DISPLAYTEXT_it;
-+              X509_CRL_set_lastUpdate;
-+              OCSP_BASICRESP_free;
-+              OCSP_BASICRESP_add1_ext_i2d;
-+              d2i_KRB5_AUTHENTBODY;
-+              CRYPTO_set_ex_data_implementation;
-+              CRYPTO_set_ex_data_impl;
-+              KRB5_ENCDATA_new;
-+              DSO_up_ref;
-+              OCSP_crl_reason_str;
-+              UI_get0_result_string;
-+              ASN1_GENERALSTRING_new;
-+              X509_SIG_it;
-+              ERR_set_implementation;
-+              ERR_load_EC_strings;
-+              UI_get0_action_string;
-+              OCSP_ONEREQ_get_ext;
-+              EC_POINT_method_of;
-+              i2d_KRB5_APREQBODY;
-+              _ossl_old_des_ecb3_encrypt;
-+              CRYPTO_get_mem_ex_functions;
-+              ENGINE_get_ex_data;
-+              UI_destroy_method;
-+              ASN1_item_i2d_bio;
-+              OCSP_ONEREQ_get_ext_by_OBJ;
-+              ASN1_primitive_new;
-+              ASN1_PRINTABLE_it;
-+              EVP_aes_192_ecb;
-+              OCSP_SIGNATURE_new;
-+              LONG_it;
-+              ASN1_VISIBLESTRING_it;
-+              OCSP_SINGLERESP_add1_ext_i2d;
-+              d2i_OCSP_CERTID;
-+              ASN1_item_d2i_fp;
-+              CRL_DIST_POINTS_it;
-+              GENERAL_NAME_print;
-+              OCSP_SINGLERESP_delete_ext;
-+              PKCS12_SAFEBAGS_it;
-+              d2i_OCSP_SIGNATURE;
-+              OCSP_request_add1_nonce;
-+              ENGINE_set_cmd_defns;
-+              OCSP_SERVICELOC_free;
-+              EC_GROUP_free;
-+              ASN1_BIT_STRING_it;
-+              X509_REQ_it;
-+              _ossl_old_des_cbc_encrypt;
-+              ERR_unload_strings;
-+              PKCS7_SIGN_ENVELOPE_it;
-+              EDIPARTYNAME_free;
-+              OCSP_REQINFO_free;
-+              EC_GROUP_new_curve_GFp;
-+              OCSP_REQUEST_get1_ext_d2i;
-+              PKCS12_item_pack_safebag;
-+              asn1_ex_c2i;
-+              ENGINE_register_digests;
-+              i2d_OCSP_REVOKEDINFO;
-+              asn1_enc_restore;
-+              UI_free;
-+              UI_new_method;
-+              EVP_EncryptInit_ex;
-+              X509_pubkey_digest;
-+              EC_POINT_invert;
-+              OCSP_basic_sign;
-+              i2d_OCSP_RESPID;
-+              OCSP_check_nonce;
-+              ENGINE_ctrl_cmd;
-+              d2i_KRB5_ENCKEY;
-+              OCSP_parse_url;
-+              OCSP_SINGLERESP_get_ext;
-+              OCSP_CRLID_free;
-+              OCSP_BASICRESP_get1_ext_d2i;
-+              RSAPrivateKey_it;
-+              ENGINE_register_all_DH;
-+              i2d_EDIPARTYNAME;
-+              EC_POINT_get_affine_coordinates_GFp;
-+              EC_POINT_get_affine_coords_GFp;
-+              OCSP_CRLID_new;
-+              ENGINE_get_flags;
-+              OCSP_ONEREQ_it;
-+              UI_process;
-+              ASN1_INTEGER_it;
-+              EVP_CipherInit_ex;
-+              UI_get_string_type;
-+              ENGINE_unregister_DH;
-+              ENGINE_register_all_DSA;
-+              OCSP_ONEREQ_get_ext_by_critical;
-+              bn_dup_expand;
-+              OCSP_cert_id_new;
-+              BASIC_CONSTRAINTS_it;
-+              BN_mod_add_quick;
-+              EC_POINT_new;
-+              EVP_MD_CTX_destroy;
-+              OCSP_RESPBYTES_free;
-+              EVP_aes_128_cbc;
-+              OCSP_SINGLERESP_get1_ext_d2i;
-+              EC_POINT_free;
-+              DH_up_ref;
-+              X509_NAME_ENTRY_it;
-+              UI_get_ex_new_index;
-+              BN_mod_sub_quick;
-+              OCSP_ONEREQ_add_ext;
-+              OCSP_request_sign;
-+              EVP_DigestFinal_ex;
-+              ENGINE_set_digests;
-+              OCSP_id_issuer_cmp;
-+              OBJ_NAME_do_all;
-+              EC_POINTs_mul;
-+              ENGINE_register_complete;
-+              X509V3_EXT_nconf_nid;
-+              ASN1_SEQUENCE_it;
-+              UI_set_default_method;
-+              RAND_query_egd_bytes;
-+              UI_method_get_writer;
-+              UI_OpenSSL;
-+              PEM_def_callback;
-+              ENGINE_cleanup;
-+              DIST_POINT_it;
-+              OCSP_SINGLERESP_it;
-+              d2i_KRB5_TKTBODY;
-+              EC_POINT_cmp;
-+              OCSP_REVOKEDINFO_new;
-+              i2d_OCSP_CERTSTATUS;
-+              OCSP_basic_add1_nonce;
-+              ASN1_item_ex_d2i;
-+              BN_mod_lshift1_quick;
-+              UI_set_method;
-+              OCSP_id_get0_info;
-+              BN_mod_sqrt;
-+              EC_GROUP_copy;
-+              KRB5_ENCDATA_free;
-+              _ossl_old_des_cfb_encrypt;
-+              OCSP_SINGLERESP_get_ext_by_OBJ;
-+              OCSP_cert_to_id;
-+              OCSP_RESPID_new;
-+              OCSP_RESPDATA_it;
-+              d2i_OCSP_RESPDATA;
-+              ENGINE_register_all_complete;
-+              OCSP_check_validity;
-+              PKCS12_BAGS_it;
-+              OCSP_url_svcloc_new;
-+              ASN1_template_free;
-+              OCSP_SINGLERESP_add_ext;
-+              KRB5_AUTHENTBODY_it;
-+              X509_supported_extension;
-+              i2d_KRB5_AUTHDATA;
-+              UI_method_get_opener;
-+              ENGINE_set_ex_data;
-+              OCSP_REQUEST_print;
-+              CBIGNUM_it;
-+              KRB5_TICKET_new;
-+              KRB5_APREQ_new;
-+              EC_GROUP_get_curve_GFp;
-+              KRB5_ENCKEY_new;
-+              ASN1_template_d2i;
-+              _ossl_old_des_quad_cksum;
-+              OCSP_single_get0_status;
-+              BN_swap;
-+              POLICYINFO_it;
-+              ENGINE_set_destroy_function;
-+              asn1_enc_free;
-+              OCSP_RESPID_it;
-+              EC_GROUP_new;
-+              EVP_aes_256_cbc;
-+              i2d_KRB5_PRINCNAME;
-+              _ossl_old_des_encrypt2;
-+              _ossl_old_des_encrypt3;
-+              PKCS8_PRIV_KEY_INFO_it;
-+              OCSP_REQINFO_it;
-+              PBEPARAM_it;
-+              KRB5_AUTHENTBODY_new;
-+              X509_CRL_add0_revoked;
-+              EDIPARTYNAME_it;
-+              NETSCAPE_SPKI_it;
-+              UI_get0_test_string;
-+              ENGINE_get_cipher_engine;
-+              ENGINE_register_all_ciphers;
-+              EC_POINT_copy;
-+              BN_kronecker;
-+              _ossl_old_des_ede3_ofb64_encrypt;
-+              _ossl_odes_ede3_ofb64_encrypt;
-+              UI_method_get_reader;
-+              OCSP_BASICRESP_get_ext_count;
-+              ASN1_ENUMERATED_it;
-+              UI_set_result;
-+              i2d_KRB5_TICKET;
-+              X509_print_ex_fp;
-+              EVP_CIPHER_CTX_set_padding;
-+              d2i_OCSP_RESPONSE;
-+              ASN1_UTCTIME_it;
-+              _ossl_old_des_enc_write;
-+              OCSP_RESPONSE_new;
-+              AES_set_encrypt_key;
-+              OCSP_resp_count;
-+              KRB5_CHECKSUM_new;
-+              ENGINE_load_cswift;
-+              OCSP_onereq_get0_id;
-+              ENGINE_set_default_ciphers;
-+              NOTICEREF_it;
-+              X509V3_EXT_CRL_add_nconf;
-+              OCSP_REVOKEDINFO_it;
-+              AES_encrypt;
-+              OCSP_REQUEST_new;
-+              ASN1_ANY_it;
-+              CRYPTO_ex_data_new_class;
-+              _ossl_old_des_ncbc_encrypt;
-+              i2d_KRB5_TKTBODY;
-+              EC_POINT_clear_free;
-+              AES_decrypt;
-+              asn1_enc_init;
-+              UI_get_result_maxsize;
-+              OCSP_CERTID_new;
-+              ENGINE_unregister_RAND;
-+              UI_method_get_closer;
-+              d2i_KRB5_ENCDATA;
-+              OCSP_request_onereq_count;
-+              OCSP_basic_verify;
-+              KRB5_AUTHENTBODY_free;
-+              ASN1_item_d2i;
-+              ASN1_primitive_free;
-+              i2d_EXTENDED_KEY_USAGE;
-+              i2d_OCSP_SIGNATURE;
-+              asn1_enc_save;
-+              ENGINE_load_nuron;
-+              _ossl_old_des_pcbc_encrypt;
-+              PKCS12_MAC_DATA_it;
-+              OCSP_accept_responses_new;
-+              asn1_do_lock;
-+              PKCS7_ATTR_VERIFY_it;
-+              KRB5_APREQBODY_it;
-+              i2d_OCSP_SINGLERESP;
-+              ASN1_item_ex_new;
-+              UI_add_verify_string;
-+              _ossl_old_des_set_key;
-+              KRB5_PRINCNAME_it;
-+              EVP_DecryptInit_ex;
-+              i2d_OCSP_CERTID;
-+              ASN1_item_d2i_bio;
-+              EC_POINT_dbl;
-+              asn1_get_choice_selector;
-+              i2d_KRB5_CHECKSUM;
-+              ENGINE_set_table_flags;
-+              AES_options;
-+              ENGINE_load_chil;
-+              OCSP_id_cmp;
-+              OCSP_BASICRESP_new;
-+              OCSP_REQUEST_get_ext_by_NID;
-+              KRB5_APREQ_it;
-+              ENGINE_get_destroy_function;
-+              CONF_set_nconf;
-+              ASN1_PRINTABLE_free;
-+              OCSP_BASICRESP_get_ext_by_NID;
-+              DIST_POINT_NAME_it;
-+              X509V3_extensions_print;
-+              _ossl_old_des_cfb64_encrypt;
-+              X509_REVOKED_add1_ext_i2d;
-+              _ossl_old_des_ofb_encrypt;
-+              KRB5_TKTBODY_new;
-+              ASN1_OCTET_STRING_it;
-+              ERR_load_UI_strings;
-+              i2d_KRB5_ENCKEY;
-+              ASN1_template_new;
-+              OCSP_SIGNATURE_free;
-+              ASN1_item_i2d_fp;
-+              KRB5_PRINCNAME_free;
-+              PKCS7_RECIP_INFO_it;
-+              EXTENDED_KEY_USAGE_it;
-+              EC_GFp_simple_method;
-+              EC_GROUP_precompute_mult;
-+              OCSP_request_onereq_get0;
-+              UI_method_set_writer;
-+              KRB5_AUTHENT_new;
-+              X509_CRL_INFO_it;
-+              DSO_set_name_converter;
-+              AES_set_decrypt_key;
-+              PKCS7_DIGEST_it;
-+              PKCS12_x5092certbag;
-+              EVP_DigestInit_ex;
-+              i2a_ACCESS_DESCRIPTION;
-+              OCSP_RESPONSE_it;
-+              PKCS7_ENC_CONTENT_it;
-+              OCSP_request_add0_id;
-+              EC_POINT_make_affine;
-+              DSO_get_filename;
-+              OCSP_CERTSTATUS_it;
-+              OCSP_request_add1_cert;
-+              UI_get0_output_string;
-+              UI_dup_verify_string;
-+              BN_mod_lshift;
-+              KRB5_AUTHDATA_it;
-+              asn1_set_choice_selector;
-+              OCSP_basic_add1_status;
-+              OCSP_RESPID_free;
-+              asn1_get_field_ptr;
-+              UI_add_input_string;
-+              OCSP_CRLID_it;
-+              i2d_KRB5_AUTHENTBODY;
-+              OCSP_REQUEST_get_ext_count;
-+              ENGINE_load_atalla;
-+              X509_NAME_it;
-+              USERNOTICE_it;
-+              OCSP_REQINFO_new;
-+              OCSP_BASICRESP_get_ext;
-+              CRYPTO_get_ex_data_implementation;
-+              CRYPTO_get_ex_data_impl;
-+              ASN1_item_pack;
-+              i2d_KRB5_ENCDATA;
-+              X509_PURPOSE_set;
-+              X509_REQ_INFO_it;
-+              UI_method_set_opener;
-+              ASN1_item_ex_free;
-+              ASN1_BOOLEAN_it;
-+              ENGINE_get_table_flags;
-+              UI_create_method;
-+              OCSP_ONEREQ_add1_ext_i2d;
-+              _shadow_DES_check_key;
-+              d2i_OCSP_REQINFO;
-+              UI_add_info_string;
-+              UI_get_result_minsize;
-+              ASN1_NULL_it;
-+              BN_mod_lshift1;
-+              d2i_OCSP_ONEREQ;
-+              OCSP_ONEREQ_new;
-+              KRB5_TICKET_it;
-+              EVP_aes_192_cbc;
-+              KRB5_TICKET_free;
-+              UI_new;
-+              OCSP_response_create;
-+              _ossl_old_des_xcbc_encrypt;
-+              PKCS7_it;
-+              OCSP_REQUEST_get_ext_by_critical;
-+              OCSP_REQUEST_get_ext_by_crit;
-+              ENGINE_set_flags;
-+              _ossl_old_des_ecb_encrypt;
-+              OCSP_response_get1_basic;
-+              EVP_Digest;
-+              OCSP_ONEREQ_delete_ext;
-+              ASN1_TBOOLEAN_it;
-+              ASN1_item_new;
-+              ASN1_TIME_to_generalizedtime;
-+              BIGNUM_it;
-+              AES_cbc_encrypt;
-+              ENGINE_get_load_privkey_function;
-+              ENGINE_get_load_privkey_fn;
-+              OCSP_RESPONSE_free;
-+              UI_method_set_reader;
-+              i2d_ASN1_T61STRING;
-+              EC_POINT_set_to_infinity;
-+              ERR_load_OCSP_strings;
-+              EC_POINT_point2oct;
-+              KRB5_APREQ_free;
-+              ASN1_OBJECT_it;
-+              OCSP_crlID_new;
-+              OCSP_crlID2_new;
-+              CONF_modules_load_file;
-+              CONF_imodule_set_usr_data;
-+              ENGINE_set_default_string;
-+              CONF_module_get_usr_data;
-+              ASN1_add_oid_module;
-+              CONF_modules_finish;
-+              OPENSSL_config;
-+              CONF_modules_unload;
-+              CONF_imodule_get_value;
-+              CONF_module_set_usr_data;
-+              CONF_parse_list;
-+              CONF_module_add;
-+              CONF_get1_default_config_file;
-+              CONF_imodule_get_flags;
-+              CONF_imodule_get_module;
-+              CONF_modules_load;
-+              CONF_imodule_get_name;
-+              ERR_peek_top_error;
-+              CONF_imodule_get_usr_data;
-+              CONF_imodule_set_flags;
-+              ENGINE_add_conf_module;
-+              ERR_peek_last_error_line;
-+              ERR_peek_last_error_line_data;
-+              ERR_peek_last_error;
-+              DES_read_2passwords;
-+              DES_read_password;
-+              UI_UTIL_read_pw;
-+              UI_UTIL_read_pw_string;
-+              ENGINE_load_aep;
-+              ENGINE_load_sureware;
-+              OPENSSL_add_all_algorithms_noconf;
-+              OPENSSL_add_all_algo_noconf;
-+              OPENSSL_add_all_algorithms_conf;
-+              OPENSSL_add_all_algo_conf;
-+              OPENSSL_load_builtin_modules;
-+              AES_ofb128_encrypt;
-+              AES_ctr128_encrypt;
-+              AES_cfb128_encrypt;
-+              ENGINE_load_4758cca;
-+              _ossl_096_des_random_seed;
-+              EVP_aes_256_ofb;
-+              EVP_aes_192_ofb;
-+              EVP_aes_128_cfb128;
-+              EVP_aes_256_cfb128;
-+              EVP_aes_128_ofb;
-+              EVP_aes_192_cfb128;
-+              CONF_modules_free;
-+              NCONF_default;
-+              OPENSSL_no_config;
-+              NCONF_WIN32;
-+              ASN1_UNIVERSALSTRING_new;
-+              EVP_des_ede_ecb;
-+              i2d_ASN1_UNIVERSALSTRING;
-+              ASN1_UNIVERSALSTRING_free;
-+              ASN1_UNIVERSALSTRING_it;
-+              d2i_ASN1_UNIVERSALSTRING;
-+              EVP_des_ede3_ecb;
-+              X509_REQ_print_ex;
-+              ENGINE_up_ref;
-+              BUF_MEM_grow_clean;
-+              CRYPTO_realloc_clean;
-+              BUF_strlcat;
-+              BIO_indent;
-+              BUF_strlcpy;
-+              OpenSSLDie;
-+              OPENSSL_cleanse;
-+              ENGINE_setup_bsd_cryptodev;
-+              ERR_release_err_state_table;
-+              EVP_aes_128_cfb8;
-+              FIPS_corrupt_rsa;
-+              FIPS_selftest_des;
-+              EVP_aes_128_cfb1;
-+              EVP_aes_192_cfb8;
-+              FIPS_mode_set;
-+              FIPS_selftest_dsa;
-+              EVP_aes_256_cfb8;
-+              FIPS_allow_md5;
-+              DES_ede3_cfb_encrypt;
-+              EVP_des_ede3_cfb8;
-+              FIPS_rand_seeded;
-+              AES_cfbr_encrypt_block;
-+              AES_cfb8_encrypt;
-+              FIPS_rand_seed;
-+              FIPS_corrupt_des;
-+              EVP_aes_192_cfb1;
-+              FIPS_selftest_aes;
-+              FIPS_set_prng_key;
-+              EVP_des_cfb8;
-+              FIPS_corrupt_dsa;
-+              FIPS_test_mode;
-+              FIPS_rand_method;
-+              EVP_aes_256_cfb1;
-+              ERR_load_FIPS_strings;
-+              FIPS_corrupt_aes;
-+              FIPS_selftest_sha1;
-+              FIPS_selftest_rsa;
-+              FIPS_corrupt_sha1;
-+              EVP_des_cfb1;
-+              FIPS_dsa_check;
-+              AES_cfb1_encrypt;
-+              EVP_des_ede3_cfb1;
-+              FIPS_rand_check;
-+              FIPS_md5_allowed;
-+              FIPS_mode;
-+              FIPS_selftest_failed;
-+              sk_is_sorted;
-+              X509_check_ca;
-+              HMAC_CTX_set_flags;
-+              d2i_PROXY_CERT_INFO_EXTENSION;
-+              PROXY_POLICY_it;
-+              i2d_PROXY_POLICY;
-+              i2d_PROXY_CERT_INFO_EXTENSION;
-+              d2i_PROXY_POLICY;
-+              PROXY_CERT_INFO_EXTENSION_new;
-+              PROXY_CERT_INFO_EXTENSION_free;
-+              PROXY_CERT_INFO_EXTENSION_it;
-+              PROXY_POLICY_free;
-+              PROXY_POLICY_new;
-+              BN_MONT_CTX_set_locked;
-+              FIPS_selftest_rng;
-+              EVP_sha384;
-+              EVP_sha512;
-+              EVP_sha224;
-+              EVP_sha256;
-+              FIPS_selftest_hmac;
-+              FIPS_corrupt_rng;
-+              BN_mod_exp_mont_consttime;
-+              RSA_X931_hash_id;
-+              RSA_padding_check_X931;
-+              RSA_verify_PKCS1_PSS;
-+              RSA_padding_add_X931;
-+              RSA_padding_add_PKCS1_PSS;
-+              PKCS1_MGF1;
-+              BN_X931_generate_Xpq;
-+              RSA_X931_generate_key;
-+              BN_X931_derive_prime;
-+              BN_X931_generate_prime;
-+              RSA_X931_derive;
-+              BIO_new_dgram;
-+              BN_get0_nist_prime_384;
-+              ERR_set_mark;
-+              X509_STORE_CTX_set0_crls;
-+              ENGINE_set_STORE;
-+              ENGINE_register_ECDSA;
-+              STORE_meth_set_list_start_fn;
-+              STORE_method_set_list_start_function;
-+              BN_BLINDING_invert_ex;
-+              NAME_CONSTRAINTS_free;
-+              STORE_ATTR_INFO_set_number;
-+              BN_BLINDING_get_thread_id;
-+              X509_STORE_CTX_set0_param;
-+              POLICY_MAPPING_it;
-+              STORE_parse_attrs_start;
-+              POLICY_CONSTRAINTS_free;
-+              EVP_PKEY_add1_attr_by_NID;
-+              BN_nist_mod_192;
-+              EC_GROUP_get_trinomial_basis;
-+              STORE_set_method;
-+              GENERAL_SUBTREE_free;
-+              NAME_CONSTRAINTS_it;
-+              ECDH_get_default_method;
-+              PKCS12_add_safe;
-+              EC_KEY_new_by_curve_name;
-+              STORE_meth_get_update_store_fn;
-+              STORE_method_get_update_store_function;
-+              ENGINE_register_ECDH;
-+              SHA512_Update;
-+              i2d_ECPrivateKey;
-+              BN_get0_nist_prime_192;
-+              STORE_modify_certificate;
-+              EC_POINT_set_affine_coordinates_GF2m;
-+              EC_POINT_set_affine_coords_GF2m;
-+              BN_GF2m_mod_exp_arr;
-+              STORE_ATTR_INFO_modify_number;
-+              X509_keyid_get0;
-+              ENGINE_load_gmp;
-+              pitem_new;
-+              BN_GF2m_mod_mul_arr;
-+              STORE_list_public_key_endp;
-+              o2i_ECPublicKey;
-+              EC_KEY_copy;
-+              BIO_dump_fp;
-+              X509_policy_node_get0_parent;
-+              EC_GROUP_check_discriminant;
-+              i2o_ECPublicKey;
-+              EC_KEY_precompute_mult;
-+              a2i_IPADDRESS;
-+              STORE_meth_set_initialise_fn;
-+              STORE_method_set_initialise_function;
-+              X509_STORE_CTX_set_depth;
-+              X509_VERIFY_PARAM_inherit;
-+              EC_POINT_point2bn;
-+              STORE_ATTR_INFO_set_dn;
-+              X509_policy_tree_get0_policies;
-+              EC_GROUP_new_curve_GF2m;
-+              STORE_destroy_method;
-+              ENGINE_unregister_STORE;
-+              EVP_PKEY_get1_EC_KEY;
-+              STORE_ATTR_INFO_get0_number;
-+              ENGINE_get_default_ECDH;
-+              EC_KEY_get_conv_form;
-+              ASN1_OCTET_STRING_NDEF_it;
-+              STORE_delete_public_key;
-+              STORE_get_public_key;
-+              STORE_modify_arbitrary;
-+              ENGINE_get_static_state;
-+              pqueue_iterator;
-+              ECDSA_SIG_new;
-+              OPENSSL_DIR_end;
-+              BN_GF2m_mod_sqr;
-+              EC_POINT_bn2point;
-+              X509_VERIFY_PARAM_set_depth;
-+              EC_KEY_set_asn1_flag;
-+              STORE_get_method;
-+              EC_KEY_get_key_method_data;
-+              ECDSA_sign_ex;
-+              STORE_parse_attrs_end;
-+              EC_GROUP_get_point_conversion_form;
-+              EC_GROUP_get_point_conv_form;
-+              STORE_method_set_store_function;
-+              STORE_ATTR_INFO_in;
-+              PEM_read_bio_ECPKParameters;
-+              EC_GROUP_get_pentanomial_basis;
-+              EVP_PKEY_add1_attr_by_txt;
-+              BN_BLINDING_set_flags;
-+              X509_VERIFY_PARAM_set1_policies;
-+              X509_VERIFY_PARAM_set1_name;
-+              X509_VERIFY_PARAM_set_purpose;
-+              STORE_get_number;
-+              ECDSA_sign_setup;
-+              BN_GF2m_mod_solve_quad_arr;
-+              EC_KEY_up_ref;
-+              POLICY_MAPPING_free;
-+              BN_GF2m_mod_div;
-+              X509_VERIFY_PARAM_set_flags;
-+              EC_KEY_free;
-+              STORE_meth_set_list_next_fn;
-+              STORE_method_set_list_next_function;
-+              PEM_write_bio_ECPrivateKey;
-+              d2i_EC_PUBKEY;
-+              STORE_meth_get_generate_fn;
-+              STORE_method_get_generate_function;
-+              STORE_meth_set_list_end_fn;
-+              STORE_method_set_list_end_function;
-+              pqueue_print;
-+              EC_GROUP_have_precompute_mult;
-+              EC_KEY_print_fp;
-+              BN_GF2m_mod_arr;
-+              PEM_write_bio_X509_CERT_PAIR;
-+              EVP_PKEY_cmp;
-+              X509_policy_level_node_count;
-+              STORE_new_engine;
-+              STORE_list_public_key_start;
-+              X509_VERIFY_PARAM_new;
-+              ECDH_get_ex_data;
-+              EVP_PKEY_get_attr;
-+              ECDSA_do_sign;
-+              ENGINE_unregister_ECDH;
-+              ECDH_OpenSSL;
-+              EC_KEY_set_conv_form;
-+              EC_POINT_dup;
-+              GENERAL_SUBTREE_new;
-+              STORE_list_crl_endp;
-+              EC_get_builtin_curves;
-+              X509_policy_node_get0_qualifiers;
-+              X509_pcy_node_get0_qualifiers;
-+              STORE_list_crl_end;
-+              EVP_PKEY_set1_EC_KEY;
-+              BN_GF2m_mod_sqrt_arr;
-+              i2d_ECPrivateKey_bio;
-+              ECPKParameters_print_fp;
-+              pqueue_find;
-+              ECDSA_SIG_free;
-+              PEM_write_bio_ECPKParameters;
-+              STORE_method_set_ctrl_function;
-+              STORE_list_public_key_end;
-+              EC_KEY_set_private_key;
-+              pqueue_peek;
-+              STORE_get_arbitrary;
-+              STORE_store_crl;
-+              X509_policy_node_get0_policy;
-+              PKCS12_add_safes;
-+              BN_BLINDING_convert_ex;
-+              X509_policy_tree_free;
-+              OPENSSL_ia32cap_loc;
-+              BN_GF2m_poly2arr;
-+              STORE_ctrl;
-+              STORE_ATTR_INFO_compare;
-+              BN_get0_nist_prime_224;
-+              i2d_ECParameters;
-+              i2d_ECPKParameters;
-+              BN_GENCB_call;
-+              d2i_ECPKParameters;
-+              STORE_meth_set_generate_fn;
-+              STORE_method_set_generate_function;
-+              ENGINE_set_ECDH;
-+              NAME_CONSTRAINTS_new;
-+              SHA256_Init;
-+              EC_KEY_get0_public_key;
-+              PEM_write_bio_EC_PUBKEY;
-+              STORE_ATTR_INFO_set_cstr;
-+              STORE_list_crl_next;
-+              STORE_ATTR_INFO_in_range;
-+              ECParameters_print;
-+              STORE_meth_set_delete_fn;
-+              STORE_method_set_delete_function;
-+              STORE_list_certificate_next;
-+              ASN1_generate_nconf;
-+              BUF_memdup;
-+              BN_GF2m_mod_mul;
-+              STORE_meth_get_list_next_fn;
-+              STORE_method_get_list_next_function;
-+              STORE_ATTR_INFO_get0_dn;
-+              STORE_list_private_key_next;
-+              EC_GROUP_set_seed;
-+              X509_VERIFY_PARAM_set_trust;
-+              STORE_ATTR_INFO_free;
-+              STORE_get_private_key;
-+              EVP_PKEY_get_attr_count;
-+              STORE_ATTR_INFO_new;
-+              EC_GROUP_get_curve_GF2m;
-+              STORE_meth_set_revoke_fn;
-+              STORE_method_set_revoke_function;
-+              STORE_store_number;
-+              BN_is_prime_ex;
-+              STORE_revoke_public_key;
-+              X509_STORE_CTX_get0_param;
-+              STORE_delete_arbitrary;
-+              PEM_read_X509_CERT_PAIR;
-+              X509_STORE_set_depth;
-+              ECDSA_get_ex_data;
-+              SHA224;
-+              BIO_dump_indent_fp;
-+              EC_KEY_set_group;
-+              BUF_strndup;
-+              STORE_list_certificate_start;
-+              BN_GF2m_mod;
-+              X509_REQ_check_private_key;
-+              EC_GROUP_get_seed_len;
-+              ERR_load_STORE_strings;
-+              PEM_read_bio_EC_PUBKEY;
-+              STORE_list_private_key_end;
-+              i2d_EC_PUBKEY;
-+              ECDSA_get_default_method;
-+              ASN1_put_eoc;
-+              X509_STORE_CTX_get_explicit_policy;
-+              X509_STORE_CTX_get_expl_policy;
-+              X509_VERIFY_PARAM_table_cleanup;
-+              STORE_modify_private_key;
-+              X509_VERIFY_PARAM_free;
-+              EC_METHOD_get_field_type;
-+              EC_GFp_nist_method;
-+              STORE_meth_set_modify_fn;
-+              STORE_method_set_modify_function;
-+              STORE_parse_attrs_next;
-+              ENGINE_load_padlock;
-+              EC_GROUP_set_curve_name;
-+              X509_CERT_PAIR_it;
-+              STORE_meth_get_revoke_fn;
-+              STORE_method_get_revoke_function;
-+              STORE_method_set_get_function;
-+              STORE_modify_number;
-+              STORE_method_get_store_function;
-+              STORE_store_private_key;
-+              BN_GF2m_mod_sqr_arr;
-+              RSA_setup_blinding;
-+              BIO_s_datagram;
-+              STORE_Memory;
-+              sk_find_ex;
-+              EC_GROUP_set_curve_GF2m;
-+              ENGINE_set_default_ECDSA;
-+              POLICY_CONSTRAINTS_new;
-+              BN_GF2m_mod_sqrt;
-+              ECDH_set_default_method;
-+              EC_KEY_generate_key;
-+              SHA384_Update;
-+              BN_GF2m_arr2poly;
-+              STORE_method_get_get_function;
-+              STORE_meth_set_cleanup_fn;
-+              STORE_method_set_cleanup_function;
-+              EC_GROUP_check;
-+              d2i_ECPrivateKey_bio;
-+              EC_KEY_insert_key_method_data;
-+              STORE_meth_get_lock_store_fn;
-+              STORE_method_get_lock_store_function;
-+              X509_VERIFY_PARAM_get_depth;
-+              SHA224_Final;
-+              STORE_meth_set_update_store_fn;
-+              STORE_method_set_update_store_function;
-+              SHA224_Update;
-+              d2i_ECPrivateKey;
-+              ASN1_item_ndef_i2d;
-+              STORE_delete_private_key;
-+              ERR_pop_to_mark;
-+              ENGINE_register_all_STORE;
-+              X509_policy_level_get0_node;
-+              i2d_PKCS7_NDEF;
-+              EC_GROUP_get_degree;
-+              ASN1_generate_v3;
-+              STORE_ATTR_INFO_modify_cstr;
-+              X509_policy_tree_level_count;
-+              BN_GF2m_add;
-+              EC_KEY_get0_group;
-+              STORE_generate_crl;
-+              STORE_store_public_key;
-+              X509_CERT_PAIR_free;
-+              STORE_revoke_private_key;
-+              BN_nist_mod_224;
-+              SHA512_Final;
-+              STORE_ATTR_INFO_modify_dn;
-+              STORE_meth_get_initialise_fn;
-+              STORE_method_get_initialise_function;
-+              STORE_delete_number;
-+              i2d_EC_PUBKEY_bio;
-+              BIO_dgram_non_fatal_error;
-+              EC_GROUP_get_asn1_flag;
-+              STORE_ATTR_INFO_in_ex;
-+              STORE_list_crl_start;
-+              ECDH_get_ex_new_index;
-+              STORE_meth_get_modify_fn;
-+              STORE_method_get_modify_function;
-+              v2i_ASN1_BIT_STRING;
-+              STORE_store_certificate;
-+              OBJ_bsearch_ex;
-+              X509_STORE_CTX_set_default;
-+              STORE_ATTR_INFO_set_sha1str;
-+              BN_GF2m_mod_inv;
-+              BN_GF2m_mod_exp;
-+              STORE_modify_public_key;
-+              STORE_meth_get_list_start_fn;
-+              STORE_method_get_list_start_function;
-+              EC_GROUP_get0_seed;
-+              STORE_store_arbitrary;
-+              STORE_meth_set_unlock_store_fn;
-+              STORE_method_set_unlock_store_function;
-+              BN_GF2m_mod_div_arr;
-+              ENGINE_set_ECDSA;
-+              STORE_create_method;
-+              ECPKParameters_print;
-+              EC_KEY_get0_private_key;
-+              PEM_write_EC_PUBKEY;
-+              X509_VERIFY_PARAM_set1;
-+              ECDH_set_method;
-+              v2i_GENERAL_NAME_ex;
-+              ECDH_set_ex_data;
-+              STORE_generate_key;
-+              BN_nist_mod_521;
-+              X509_policy_tree_get0_level;
-+              EC_GROUP_set_point_conversion_form;
-+              EC_GROUP_set_point_conv_form;
-+              PEM_read_EC_PUBKEY;
-+              i2d_ECDSA_SIG;
-+              ECDSA_OpenSSL;
-+              STORE_delete_crl;
-+              EC_KEY_get_enc_flags;
-+              ASN1_const_check_infinite_end;
-+              EVP_PKEY_delete_attr;
-+              ECDSA_set_default_method;
-+              EC_POINT_set_compressed_coordinates_GF2m;
-+              EC_POINT_set_compr_coords_GF2m;
-+              EC_GROUP_cmp;
-+              STORE_revoke_certificate;
-+              BN_get0_nist_prime_256;
-+              STORE_meth_get_delete_fn;
-+              STORE_method_get_delete_function;
-+              SHA224_Init;
-+              PEM_read_ECPrivateKey;
-+              SHA512_Init;
-+              STORE_parse_attrs_endp;
-+              BN_set_negative;
-+              ERR_load_ECDSA_strings;
-+              EC_GROUP_get_basis_type;
-+              STORE_list_public_key_next;
-+              i2v_ASN1_BIT_STRING;
-+              STORE_OBJECT_free;
-+              BN_nist_mod_384;
-+              i2d_X509_CERT_PAIR;
-+              PEM_write_ECPKParameters;
-+              ECDH_compute_key;
-+              STORE_ATTR_INFO_get0_sha1str;
-+              ENGINE_register_all_ECDH;
-+              pqueue_pop;
-+              STORE_ATTR_INFO_get0_cstr;
-+              POLICY_CONSTRAINTS_it;
-+              STORE_get_ex_new_index;
-+              EVP_PKEY_get_attr_by_OBJ;
-+              X509_VERIFY_PARAM_add0_policy;
-+              BN_GF2m_mod_solve_quad;
-+              SHA256;
-+              i2d_ECPrivateKey_fp;
-+              X509_policy_tree_get0_user_policies;
-+              X509_pcy_tree_get0_usr_policies;
-+              OPENSSL_DIR_read;
-+              ENGINE_register_all_ECDSA;
-+              X509_VERIFY_PARAM_lookup;
-+              EC_POINT_get_affine_coordinates_GF2m;
-+              EC_POINT_get_affine_coords_GF2m;
-+              EC_GROUP_dup;
-+              ENGINE_get_default_ECDSA;
-+              EC_KEY_new;
-+              SHA256_Transform;
-+              EC_KEY_set_enc_flags;
-+              ECDSA_verify;
-+              EC_POINT_point2hex;
-+              ENGINE_get_STORE;
-+              SHA512;
-+              STORE_get_certificate;
-+              ECDSA_do_sign_ex;
-+              ECDSA_do_verify;
-+              d2i_ECPrivateKey_fp;
-+              STORE_delete_certificate;
-+              SHA512_Transform;
-+              X509_STORE_set1_param;
-+              STORE_method_get_ctrl_function;
-+              STORE_free;
-+              PEM_write_ECPrivateKey;
-+              STORE_meth_get_unlock_store_fn;
-+              STORE_method_get_unlock_store_function;
-+              STORE_get_ex_data;
-+              EC_KEY_set_public_key;
-+              PEM_read_ECPKParameters;
-+              X509_CERT_PAIR_new;
-+              ENGINE_register_STORE;
-+              RSA_generate_key_ex;
-+              DSA_generate_parameters_ex;
-+              ECParameters_print_fp;
-+              X509V3_NAME_from_section;
-+              EVP_PKEY_add1_attr;
-+              STORE_modify_crl;
-+              STORE_list_private_key_start;
-+              POLICY_MAPPINGS_it;
-+              GENERAL_SUBTREE_it;
-+              EC_GROUP_get_curve_name;
-+              PEM_write_X509_CERT_PAIR;
-+              BIO_dump_indent_cb;
-+              d2i_X509_CERT_PAIR;
-+              STORE_list_private_key_endp;
-+              asn1_const_Finish;
-+              i2d_EC_PUBKEY_fp;
-+              BN_nist_mod_256;
-+              X509_VERIFY_PARAM_add0_table;
-+              pqueue_free;
-+              BN_BLINDING_create_param;
-+              ECDSA_size;
-+              d2i_EC_PUBKEY_bio;
-+              BN_get0_nist_prime_521;
-+              STORE_ATTR_INFO_modify_sha1str;
-+              BN_generate_prime_ex;
-+              EC_GROUP_new_by_curve_name;
-+              SHA256_Final;
-+              DH_generate_parameters_ex;
-+              PEM_read_bio_ECPrivateKey;
-+              STORE_meth_get_cleanup_fn;
-+              STORE_method_get_cleanup_function;
-+              ENGINE_get_ECDH;
-+              d2i_ECDSA_SIG;
-+              BN_is_prime_fasttest_ex;
-+              ECDSA_sign;
-+              X509_policy_check;
-+              EVP_PKEY_get_attr_by_NID;
-+              STORE_set_ex_data;
-+              ENGINE_get_ECDSA;
-+              EVP_ecdsa;
-+              BN_BLINDING_get_flags;
-+              PKCS12_add_cert;
-+              STORE_OBJECT_new;
-+              ERR_load_ECDH_strings;
-+              EC_KEY_dup;
-+              EVP_CIPHER_CTX_rand_key;
-+              ECDSA_set_method;
-+              a2i_IPADDRESS_NC;
-+              d2i_ECParameters;
-+              STORE_list_certificate_end;
-+              STORE_get_crl;
-+              X509_POLICY_NODE_print;
-+              SHA384_Init;
-+              EC_GF2m_simple_method;
-+              ECDSA_set_ex_data;
-+              SHA384_Final;
-+              PKCS7_set_digest;
-+              EC_KEY_print;
-+              STORE_meth_set_lock_store_fn;
-+              STORE_method_set_lock_store_function;
-+              ECDSA_get_ex_new_index;
-+              SHA384;
-+              POLICY_MAPPING_new;
-+              STORE_list_certificate_endp;
-+              X509_STORE_CTX_get0_policy_tree;
-+              EC_GROUP_set_asn1_flag;
-+              EC_KEY_check_key;
-+              d2i_EC_PUBKEY_fp;
-+              PKCS7_set0_type_other;
-+              PEM_read_bio_X509_CERT_PAIR;
-+              pqueue_next;
-+              STORE_meth_get_list_end_fn;
-+              STORE_method_get_list_end_function;
-+              EVP_PKEY_add1_attr_by_OBJ;
-+              X509_VERIFY_PARAM_set_time;
-+              pqueue_new;
-+              ENGINE_set_default_ECDH;
-+              STORE_new_method;
-+              PKCS12_add_key;
-+              DSO_merge;
-+              EC_POINT_hex2point;
-+              BIO_dump_cb;
-+              SHA256_Update;
-+              pqueue_insert;
-+              pitem_free;
-+              BN_GF2m_mod_inv_arr;
-+              ENGINE_unregister_ECDSA;
-+              BN_BLINDING_set_thread_id;
-+              get_rfc3526_prime_8192;
-+              X509_VERIFY_PARAM_clear_flags;
-+              get_rfc2409_prime_1024;
-+              DH_check_pub_key;
-+              get_rfc3526_prime_2048;
-+              get_rfc3526_prime_6144;
-+              get_rfc3526_prime_1536;
-+              get_rfc3526_prime_3072;
-+              get_rfc3526_prime_4096;
-+              get_rfc2409_prime_768;
-+              X509_VERIFY_PARAM_get_flags;
-+              EVP_CIPHER_CTX_new;
-+              EVP_CIPHER_CTX_free;
-+              Camellia_cbc_encrypt;
-+              Camellia_cfb128_encrypt;
-+              Camellia_cfb1_encrypt;
-+              Camellia_cfb8_encrypt;
-+              Camellia_ctr128_encrypt;
-+              Camellia_cfbr_encrypt_block;
-+              Camellia_decrypt;
-+              Camellia_ecb_encrypt;
-+              Camellia_encrypt;
-+              Camellia_ofb128_encrypt;
-+              Camellia_set_key;
-+              EVP_camellia_128_cbc;
-+              EVP_camellia_128_cfb128;
-+              EVP_camellia_128_cfb1;
-+              EVP_camellia_128_cfb8;
-+              EVP_camellia_128_ecb;
-+              EVP_camellia_128_ofb;
-+              EVP_camellia_192_cbc;
-+              EVP_camellia_192_cfb128;
-+              EVP_camellia_192_cfb1;
-+              EVP_camellia_192_cfb8;
-+              EVP_camellia_192_ecb;
-+              EVP_camellia_192_ofb;
-+              EVP_camellia_256_cbc;
-+              EVP_camellia_256_cfb128;
-+              EVP_camellia_256_cfb1;
-+              EVP_camellia_256_cfb8;
-+              EVP_camellia_256_ecb;
-+              EVP_camellia_256_ofb;
-+              a2i_ipadd;
-+              ASIdentifiers_free;
-+              i2d_ASIdOrRange;
-+              EVP_CIPHER_block_size;
-+              v3_asid_is_canonical;
-+              IPAddressChoice_free;
-+              EVP_CIPHER_CTX_set_app_data;
-+              BIO_set_callback_arg;
-+              v3_addr_add_prefix;
-+              IPAddressOrRange_it;
-+              BIO_set_flags;
-+              ASIdentifiers_it;
-+              v3_addr_get_range;
-+              BIO_method_type;
-+              v3_addr_inherits;
-+              IPAddressChoice_it;
-+              AES_ige_encrypt;
-+              v3_addr_add_range;
-+              EVP_CIPHER_CTX_nid;
-+              d2i_ASRange;
-+              v3_addr_add_inherit;
-+              v3_asid_add_id_or_range;
-+              v3_addr_validate_resource_set;
-+              EVP_CIPHER_iv_length;
-+              EVP_MD_type;
-+              v3_asid_canonize;
-+              IPAddressRange_free;
-+              v3_asid_add_inherit;
-+              EVP_CIPHER_CTX_key_length;
-+              IPAddressRange_new;
-+              ASIdOrRange_new;
-+              EVP_MD_size;
-+              EVP_MD_CTX_test_flags;
-+              BIO_clear_flags;
-+              i2d_ASRange;
-+              IPAddressRange_it;
-+              IPAddressChoice_new;
-+              ASIdentifierChoice_new;
-+              ASRange_free;
-+              EVP_MD_pkey_type;
-+              EVP_MD_CTX_clear_flags;
-+              IPAddressFamily_free;
-+              i2d_IPAddressFamily;
-+              IPAddressOrRange_new;
-+              EVP_CIPHER_flags;
-+              v3_asid_validate_resource_set;
-+              d2i_IPAddressRange;
-+              AES_bi_ige_encrypt;
-+              BIO_get_callback;
-+              IPAddressOrRange_free;
-+              v3_addr_subset;
-+              d2i_IPAddressFamily;
-+              v3_asid_subset;
-+              BIO_test_flags;
-+              i2d_ASIdentifierChoice;
-+              ASRange_it;
-+              d2i_ASIdentifiers;
-+              ASRange_new;
-+              d2i_IPAddressChoice;
-+              v3_addr_get_afi;
-+              EVP_CIPHER_key_length;
-+              EVP_Cipher;
-+              i2d_IPAddressOrRange;
-+              ASIdOrRange_it;
-+              EVP_CIPHER_nid;
-+              i2d_IPAddressChoice;
-+              EVP_CIPHER_CTX_block_size;
-+              ASIdentifiers_new;
-+              v3_addr_validate_path;
-+              IPAddressFamily_new;
-+              EVP_MD_CTX_set_flags;
-+              v3_addr_is_canonical;
-+              i2d_IPAddressRange;
-+              IPAddressFamily_it;
-+              v3_asid_inherits;
-+              EVP_CIPHER_CTX_cipher;
-+              EVP_CIPHER_CTX_get_app_data;
-+              EVP_MD_block_size;
-+              EVP_CIPHER_CTX_flags;
-+              v3_asid_validate_path;
-+              d2i_IPAddressOrRange;
-+              v3_addr_canonize;
-+              ASIdentifierChoice_it;
-+              EVP_MD_CTX_md;
-+              d2i_ASIdentifierChoice;
-+              BIO_method_name;
-+              EVP_CIPHER_CTX_iv_length;
-+              ASIdOrRange_free;
-+              ASIdentifierChoice_free;
-+              BIO_get_callback_arg;
-+              BIO_set_callback;
-+              d2i_ASIdOrRange;
-+              i2d_ASIdentifiers;
-+              SEED_decrypt;
-+              SEED_encrypt;
-+              SEED_cbc_encrypt;
-+              EVP_seed_ofb;
-+              SEED_cfb128_encrypt;
-+              SEED_ofb128_encrypt;
-+              EVP_seed_cbc;
-+              SEED_ecb_encrypt;
-+              EVP_seed_ecb;
-+              SEED_set_key;
-+              EVP_seed_cfb128;
-+              X509_EXTENSIONS_it;
-+              X509_get1_ocsp;
-+              OCSP_REQ_CTX_free;
-+              i2d_X509_EXTENSIONS;
-+              OCSP_sendreq_nbio;
-+              OCSP_sendreq_new;
-+              d2i_X509_EXTENSIONS;
-+              X509_ALGORS_it;
-+              X509_ALGOR_get0;
-+              X509_ALGOR_set0;
-+              AES_unwrap_key;
-+              AES_wrap_key;
-+              X509at_get0_data_by_OBJ;
-+              ASN1_TYPE_set1;
-+              ASN1_STRING_set0;
-+              i2d_X509_ALGORS;
-+              BIO_f_zlib;
-+              COMP_zlib_cleanup;
-+              d2i_X509_ALGORS;
-+              CMS_ReceiptRequest_free;
-+              PEM_write_CMS;
-+              CMS_add0_CertificateChoices;
-+              CMS_unsigned_add1_attr_by_OBJ;
-+              ERR_load_CMS_strings;
-+              CMS_sign_receipt;
-+              i2d_CMS_ContentInfo;
-+              CMS_signed_delete_attr;
-+              d2i_CMS_bio;
-+              CMS_unsigned_get_attr_by_NID;
-+              CMS_verify;
-+              SMIME_read_CMS;
-+              CMS_decrypt_set1_key;
-+              CMS_SignerInfo_get0_algs;
-+              CMS_add1_cert;
-+              CMS_set_detached;
-+              CMS_encrypt;
-+              CMS_EnvelopedData_create;
-+              CMS_uncompress;
-+              CMS_add0_crl;
-+              CMS_SignerInfo_verify_content;
-+              CMS_unsigned_get0_data_by_OBJ;
-+              PEM_write_bio_CMS;
-+              CMS_unsigned_get_attr;
-+              CMS_RecipientInfo_ktri_cert_cmp;
-+              CMS_RecipientInfo_ktri_get0_algs;
-+              CMS_RecipInfo_ktri_get0_algs;
-+              CMS_ContentInfo_free;
-+              CMS_final;
-+              CMS_add_simple_smimecap;
-+              CMS_SignerInfo_verify;
-+              CMS_data;
-+              CMS_ContentInfo_it;
-+              d2i_CMS_ReceiptRequest;
-+              CMS_compress;
-+              CMS_digest_create;
-+              CMS_SignerInfo_cert_cmp;
-+              CMS_SignerInfo_sign;
-+              CMS_data_create;
-+              i2d_CMS_bio;
-+              CMS_EncryptedData_set1_key;
-+              CMS_decrypt;
-+              int_smime_write_ASN1;
-+              CMS_unsigned_delete_attr;
-+              CMS_unsigned_get_attr_count;
-+              CMS_add_smimecap;
-+              PEM_read_CMS;
-+              CMS_signed_get_attr_by_OBJ;
-+              d2i_CMS_ContentInfo;
-+              CMS_add_standard_smimecap;
-+              CMS_ContentInfo_new;
-+              CMS_RecipientInfo_type;
-+              CMS_get0_type;
-+              CMS_is_detached;
-+              CMS_sign;
-+              CMS_signed_add1_attr;
-+              CMS_unsigned_get_attr_by_OBJ;
-+              SMIME_write_CMS;
-+              CMS_EncryptedData_decrypt;
-+              CMS_get0_RecipientInfos;
-+              CMS_add0_RevocationInfoChoice;
-+              CMS_decrypt_set1_pkey;
-+              CMS_SignerInfo_set1_signer_cert;
-+              CMS_get0_signers;
-+              CMS_ReceiptRequest_get0_values;
-+              CMS_signed_get0_data_by_OBJ;
-+              CMS_get0_SignerInfos;
-+              CMS_add0_cert;
-+              CMS_EncryptedData_encrypt;
-+              CMS_digest_verify;
-+              CMS_set1_signers_certs;
-+              CMS_signed_get_attr;
-+              CMS_RecipientInfo_set0_key;
-+              CMS_SignedData_init;
-+              CMS_RecipientInfo_kekri_get0_id;
-+              CMS_verify_receipt;
-+              CMS_ReceiptRequest_it;
-+              PEM_read_bio_CMS;
-+              CMS_get1_crls;
-+              CMS_add0_recipient_key;
-+              SMIME_read_ASN1;
-+              CMS_ReceiptRequest_new;
-+              CMS_get0_content;
-+              CMS_get1_ReceiptRequest;
-+              CMS_signed_add1_attr_by_OBJ;
-+              CMS_RecipientInfo_kekri_id_cmp;
-+              CMS_add1_ReceiptRequest;
-+              CMS_SignerInfo_get0_signer_id;
-+              CMS_unsigned_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr;
-+              CMS_signed_get_attr_by_NID;
-+              CMS_get1_certs;
-+              CMS_signed_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr_by_txt;
-+              CMS_dataFinal;
-+              CMS_RecipientInfo_ktri_get0_signer_id;
-+              CMS_RecipInfo_ktri_get0_sigr_id;
-+              i2d_CMS_ReceiptRequest;
-+              CMS_add1_recipient_cert;
-+              CMS_dataInit;
-+              CMS_signed_add1_attr_by_txt;
-+              CMS_RecipientInfo_decrypt;
-+              CMS_signed_get_attr_count;
-+              CMS_get0_eContentType;
-+              CMS_set1_eContentType;
-+              CMS_ReceiptRequest_create0;
-+              CMS_add1_signer;
-+              CMS_RecipientInfo_set0_pkey;
-+              ENGINE_set_load_ssl_client_cert_function;
-+              ENGINE_set_ld_ssl_clnt_cert_fn;
-+              ENGINE_get_ssl_client_cert_function;
-+              ENGINE_get_ssl_client_cert_fn;
-+              ENGINE_load_ssl_client_cert;
-+              ENGINE_load_capi;
-+              OPENSSL_isservice;
-+              FIPS_dsa_sig_decode;
-+              EVP_CIPHER_CTX_clear_flags;
-+              FIPS_rand_status;
-+              FIPS_rand_set_key;
-+              CRYPTO_set_mem_info_functions;
-+              RSA_X931_generate_key_ex;
-+              int_ERR_set_state_func;
-+              int_EVP_MD_set_engine_callbacks;
-+              int_CRYPTO_set_do_dynlock_callback;
-+              FIPS_rng_stick;
-+              EVP_CIPHER_CTX_set_flags;
-+              BN_X931_generate_prime_ex;
-+              FIPS_selftest_check;
-+              FIPS_rand_set_dt;
-+              CRYPTO_dbg_pop_info;
-+              FIPS_dsa_free;
-+              RSA_X931_derive_ex;
-+              FIPS_rsa_new;
-+              FIPS_rand_bytes;
-+              fips_cipher_test;
-+              EVP_CIPHER_CTX_test_flags;
-+              CRYPTO_malloc_debug_init;
-+              CRYPTO_dbg_push_info;
-+              FIPS_corrupt_rsa_keygen;
-+              FIPS_dh_new;
-+              FIPS_corrupt_dsa_keygen;
-+              FIPS_dh_free;
-+              fips_pkey_signature_test;
-+              EVP_add_alg_module;
-+              int_RAND_init_engine_callbacks;
-+              int_EVP_CIPHER_set_engine_callbacks;
-+              int_EVP_MD_init_engine_callbacks;
-+              FIPS_rand_test_mode;
-+              FIPS_rand_reset;
-+              FIPS_dsa_new;
-+              int_RAND_set_callbacks;
-+              BN_X931_derive_prime_ex;
-+              int_ERR_lib_init;
-+              int_EVP_CIPHER_init_engine_callbacks;
-+              FIPS_rsa_free;
-+              FIPS_dsa_sig_encode;
-+              CRYPTO_dbg_remove_all_info;
-+              OPENSSL_init;
-+              CRYPTO_strdup;
-+              JPAKE_STEP3A_process;
-+              JPAKE_STEP1_release;
-+              JPAKE_get_shared_key;
-+              JPAKE_STEP3B_init;
-+              JPAKE_STEP1_generate;
-+              JPAKE_STEP1_init;
-+              JPAKE_STEP3B_process;
-+              JPAKE_STEP2_generate;
-+              JPAKE_CTX_new;
-+              JPAKE_CTX_free;
-+              JPAKE_STEP3B_release;
-+              JPAKE_STEP3A_release;
-+              JPAKE_STEP2_process;
-+              JPAKE_STEP3B_generate;
-+              JPAKE_STEP1_process;
-+              JPAKE_STEP3A_generate;
-+              JPAKE_STEP2_release;
-+              JPAKE_STEP3A_init;
-+              ERR_load_JPAKE_strings;
-+              JPAKE_STEP2_init;
-+              pqueue_size;
-+              i2d_TS_ACCURACY;
-+              i2d_TS_MSG_IMPRINT_fp;
-+              i2d_TS_MSG_IMPRINT;
-+              EVP_PKEY_print_public;
-+              EVP_PKEY_CTX_new;
-+              i2d_TS_TST_INFO;
-+              EVP_PKEY_asn1_find;
-+              DSO_METHOD_beos;
-+              TS_CONF_load_cert;
-+              TS_REQ_get_ext;
-+              EVP_PKEY_sign_init;
-+              ASN1_item_print;
-+              TS_TST_INFO_set_nonce;
-+              TS_RESP_dup;
-+              ENGINE_register_pkey_meths;
-+              EVP_PKEY_asn1_add0;
-+              PKCS7_add0_attrib_signing_time;
-+              i2d_TS_TST_INFO_fp;
-+              BIO_asn1_get_prefix;
-+              TS_TST_INFO_set_time;
-+              EVP_PKEY_meth_set_decrypt;
-+              EVP_PKEY_set_type_str;
-+              EVP_PKEY_CTX_get_keygen_info;
-+              TS_REQ_set_policy_id;
-+              d2i_TS_RESP_fp;
-+              ENGINE_get_pkey_asn1_meth_engine;
-+              ENGINE_get_pkey_asn1_meth_eng;
-+              WHIRLPOOL_Init;
-+              TS_RESP_set_status_info;
-+              EVP_PKEY_keygen;
-+              EVP_DigestSignInit;
-+              TS_ACCURACY_set_millis;
-+              TS_REQ_dup;
-+              GENERAL_NAME_dup;
-+              ASN1_SEQUENCE_ANY_it;
-+              WHIRLPOOL;
-+              X509_STORE_get1_crls;
-+              ENGINE_get_pkey_asn1_meth;
-+              EVP_PKEY_asn1_new;
-+              BIO_new_NDEF;
-+              ENGINE_get_pkey_meth;
-+              TS_MSG_IMPRINT_set_algo;
-+              i2d_TS_TST_INFO_bio;
-+              TS_TST_INFO_set_ordering;
-+              TS_TST_INFO_get_ext_by_OBJ;
-+              CRYPTO_THREADID_set_pointer;
-+              TS_CONF_get_tsa_section;
-+              SMIME_write_ASN1;
-+              TS_RESP_CTX_set_signer_key;
-+              EVP_PKEY_encrypt_old;
-+              EVP_PKEY_encrypt_init;
-+              CRYPTO_THREADID_cpy;
-+              ASN1_PCTX_get_cert_flags;
-+              i2d_ESS_SIGNING_CERT;
-+              TS_CONF_load_key;
-+              i2d_ASN1_SEQUENCE_ANY;
-+              d2i_TS_MSG_IMPRINT_bio;
-+              EVP_PKEY_asn1_set_public;
-+              b2i_PublicKey_bio;
-+              BIO_asn1_set_prefix;
-+              EVP_PKEY_new_mac_key;
-+              BIO_new_CMS;
-+              CRYPTO_THREADID_cmp;
-+              TS_REQ_ext_free;
-+              EVP_PKEY_asn1_set_free;
-+              EVP_PKEY_get0_asn1;
-+              d2i_NETSCAPE_X509;
-+              EVP_PKEY_verify_recover_init;
-+              EVP_PKEY_CTX_set_data;
-+              EVP_PKEY_keygen_init;
-+              TS_RESP_CTX_set_status_info;
-+              TS_MSG_IMPRINT_get_algo;
-+              TS_REQ_print_bio;
-+              EVP_PKEY_CTX_ctrl_str;
-+              EVP_PKEY_get_default_digest_nid;
-+              PEM_write_bio_PKCS7_stream;
-+              TS_MSG_IMPRINT_print_bio;
-+              BN_asc2bn;
-+              TS_REQ_get_policy_id;
-+              ENGINE_set_default_pkey_asn1_meths;
-+              ENGINE_set_def_pkey_asn1_meths;
-+              d2i_TS_ACCURACY;
-+              DSO_global_lookup;
-+              TS_CONF_set_tsa_name;
-+              i2d_ASN1_SET_ANY;
-+              ENGINE_load_gost;
-+              WHIRLPOOL_BitUpdate;
-+              ASN1_PCTX_get_flags;
-+              TS_TST_INFO_get_ext_by_NID;
-+              TS_RESP_new;
-+              ESS_CERT_ID_dup;
-+              TS_STATUS_INFO_dup;
-+              TS_REQ_delete_ext;
-+              EVP_DigestVerifyFinal;
-+              EVP_PKEY_print_params;
-+              i2d_CMS_bio_stream;
-+              TS_REQ_get_msg_imprint;
-+              OBJ_find_sigid_by_algs;
-+              TS_TST_INFO_get_serial;
-+              TS_REQ_get_nonce;
-+              X509_PUBKEY_set0_param;
-+              EVP_PKEY_CTX_set0_keygen_info;
-+              DIST_POINT_set_dpname;
-+              i2d_ISSUING_DIST_POINT;
-+              ASN1_SET_ANY_it;
-+              EVP_PKEY_CTX_get_data;
-+              TS_STATUS_INFO_print_bio;
-+              EVP_PKEY_derive_init;
-+              d2i_TS_TST_INFO;
-+              EVP_PKEY_asn1_add_alias;
-+              d2i_TS_RESP_bio;
-+              OTHERNAME_cmp;
-+              GENERAL_NAME_set0_value;
-+              PKCS7_RECIP_INFO_get0_alg;
-+              TS_RESP_CTX_new;
-+              TS_RESP_set_tst_info;
-+              PKCS7_final;
-+              EVP_PKEY_base_id;
-+              TS_RESP_CTX_set_signer_cert;
-+              TS_REQ_set_msg_imprint;
-+              EVP_PKEY_CTX_ctrl;
-+              TS_CONF_set_digests;
-+              d2i_TS_MSG_IMPRINT;
-+              EVP_PKEY_meth_set_ctrl;
-+              TS_REQ_get_ext_by_NID;
-+              PKCS5_pbe_set0_algor;
-+              BN_BLINDING_thread_id;
-+              TS_ACCURACY_new;
-+              X509_CRL_METHOD_free;
-+              ASN1_PCTX_get_nm_flags;
-+              EVP_PKEY_meth_set_sign;
-+              CRYPTO_THREADID_current;
-+              EVP_PKEY_decrypt_init;
-+              NETSCAPE_X509_free;
-+              i2b_PVK_bio;
-+              EVP_PKEY_print_private;
-+              GENERAL_NAME_get0_value;
-+              b2i_PVK_bio;
-+              ASN1_UTCTIME_adj;
-+              TS_TST_INFO_new;
-+              EVP_MD_do_all_sorted;
-+              TS_CONF_set_default_engine;
-+              TS_ACCURACY_set_seconds;
-+              TS_TST_INFO_get_time;
-+              PKCS8_pkey_get0;
-+              EVP_PKEY_asn1_get0;
-+              OBJ_add_sigid;
-+              PKCS7_SIGNER_INFO_sign;
-+              EVP_PKEY_paramgen_init;
-+              EVP_PKEY_sign;
-+              OBJ_sigid_free;
-+              EVP_PKEY_meth_set_init;
-+              d2i_ESS_ISSUER_SERIAL;
-+              ISSUING_DIST_POINT_new;
-+              ASN1_TIME_adj;
-+              TS_OBJ_print_bio;
-+              EVP_PKEY_meth_set_verify_recover;
-+              EVP_PKEY_meth_set_vrfy_recover;
-+              TS_RESP_get_status_info;
-+              CMS_stream;
-+              EVP_PKEY_CTX_set_cb;
-+              PKCS7_to_TS_TST_INFO;
-+              ASN1_PCTX_get_oid_flags;
-+              TS_TST_INFO_add_ext;
-+              EVP_PKEY_meth_set_derive;
-+              i2d_TS_RESP_fp;
-+              i2d_TS_MSG_IMPRINT_bio;
-+              TS_RESP_CTX_set_accuracy;
-+              TS_REQ_set_nonce;
-+              ESS_CERT_ID_new;
-+              ENGINE_pkey_asn1_find_str;
-+              TS_REQ_get_ext_count;
-+              BUF_reverse;
-+              TS_TST_INFO_print_bio;
-+              d2i_ISSUING_DIST_POINT;
-+              ENGINE_get_pkey_meths;
-+              i2b_PrivateKey_bio;
-+              i2d_TS_RESP;
-+              b2i_PublicKey;
-+              TS_VERIFY_CTX_cleanup;
-+              TS_STATUS_INFO_free;
-+              TS_RESP_verify_token;
-+              OBJ_bsearch_ex_;
-+              ASN1_bn_print;
-+              EVP_PKEY_asn1_get_count;
-+              ENGINE_register_pkey_asn1_meths;
-+              ASN1_PCTX_set_nm_flags;
-+              EVP_DigestVerifyInit;
-+              ENGINE_set_default_pkey_meths;
-+              TS_TST_INFO_get_policy_id;
-+              TS_REQ_get_cert_req;
-+              X509_CRL_set_meth_data;
-+              PKCS8_pkey_set0;
-+              ASN1_STRING_copy;
-+              d2i_TS_TST_INFO_fp;
-+              X509_CRL_match;
-+              EVP_PKEY_asn1_set_private;
-+              TS_TST_INFO_get_ext_d2i;
-+              TS_RESP_CTX_add_policy;
-+              d2i_TS_RESP;
-+              TS_CONF_load_certs;
-+              TS_TST_INFO_get_msg_imprint;
-+              ERR_load_TS_strings;
-+              TS_TST_INFO_get_version;
-+              EVP_PKEY_CTX_dup;
-+              EVP_PKEY_meth_set_verify;
-+              i2b_PublicKey_bio;
-+              TS_CONF_set_certs;
-+              EVP_PKEY_asn1_get0_info;
-+              TS_VERIFY_CTX_free;
-+              TS_REQ_get_ext_by_critical;
-+              TS_RESP_CTX_set_serial_cb;
-+              X509_CRL_get_meth_data;
-+              TS_RESP_CTX_set_time_cb;
-+              TS_MSG_IMPRINT_get_msg;
-+              TS_TST_INFO_ext_free;
-+              TS_REQ_get_version;
-+              TS_REQ_add_ext;
-+              EVP_PKEY_CTX_set_app_data;
-+              OBJ_bsearch_;
-+              EVP_PKEY_meth_set_verifyctx;
-+              i2d_PKCS7_bio_stream;
-+              CRYPTO_THREADID_set_numeric;
-+              PKCS7_sign_add_signer;
-+              d2i_TS_TST_INFO_bio;
-+              TS_TST_INFO_get_ordering;
-+              TS_RESP_print_bio;
-+              TS_TST_INFO_get_exts;
-+              HMAC_CTX_copy;
-+              PKCS5_pbe2_set_iv;
-+              ENGINE_get_pkey_asn1_meths;
-+              b2i_PrivateKey;
-+              EVP_PKEY_CTX_get_app_data;
-+              TS_REQ_set_cert_req;
-+              CRYPTO_THREADID_set_callback;
-+              TS_CONF_set_serial;
-+              TS_TST_INFO_free;
-+              d2i_TS_REQ_fp;
-+              TS_RESP_verify_response;
-+              i2d_ESS_ISSUER_SERIAL;
-+              TS_ACCURACY_get_seconds;
-+              EVP_CIPHER_do_all;
-+              b2i_PrivateKey_bio;
-+              OCSP_CERTID_dup;
-+              X509_PUBKEY_get0_param;
-+              TS_MSG_IMPRINT_dup;
-+              PKCS7_print_ctx;
-+              i2d_TS_REQ_bio;
-+              EVP_whirlpool;
-+              EVP_PKEY_asn1_set_param;
-+              EVP_PKEY_meth_set_encrypt;
-+              ASN1_PCTX_set_flags;
-+              i2d_ESS_CERT_ID;
-+              TS_VERIFY_CTX_new;
-+              TS_RESP_CTX_set_extension_cb;
-+              ENGINE_register_all_pkey_meths;
-+              TS_RESP_CTX_set_status_info_cond;
-+              TS_RESP_CTX_set_stat_info_cond;
-+              EVP_PKEY_verify;
-+              WHIRLPOOL_Final;
-+              X509_CRL_METHOD_new;
-+              EVP_DigestSignFinal;
-+              TS_RESP_CTX_set_def_policy;
-+              NETSCAPE_X509_it;
-+              TS_RESP_create_response;
-+              PKCS7_SIGNER_INFO_get0_algs;
-+              TS_TST_INFO_get_nonce;
-+              EVP_PKEY_decrypt_old;
-+              TS_TST_INFO_set_policy_id;
-+              TS_CONF_set_ess_cert_id_chain;
-+              EVP_PKEY_CTX_get0_pkey;
-+              d2i_TS_REQ;
-+              EVP_PKEY_asn1_find_str;
-+              BIO_f_asn1;
-+              ESS_SIGNING_CERT_new;
-+              EVP_PBE_find;
-+              X509_CRL_get0_by_cert;
-+              EVP_PKEY_derive;
-+              i2d_TS_REQ;
-+              TS_TST_INFO_delete_ext;
-+              ESS_ISSUER_SERIAL_free;
-+              ASN1_PCTX_set_str_flags;
-+              ENGINE_get_pkey_asn1_meth_str;
-+              TS_CONF_set_signer_key;
-+              TS_ACCURACY_get_millis;
-+              TS_RESP_get_token;
-+              TS_ACCURACY_dup;
-+              ENGINE_register_all_pkey_asn1_meths;
-+              ENGINE_reg_all_pkey_asn1_meths;
-+              X509_CRL_set_default_method;
-+              CRYPTO_THREADID_hash;
-+              CMS_ContentInfo_print_ctx;
-+              TS_RESP_free;
-+              ISSUING_DIST_POINT_free;
-+              ESS_ISSUER_SERIAL_new;
-+              CMS_add1_crl;
-+              PKCS7_add1_attrib_digest;
-+              TS_RESP_CTX_add_md;
-+              TS_TST_INFO_dup;
-+              ENGINE_set_pkey_asn1_meths;
-+              PEM_write_bio_Parameters;
-+              TS_TST_INFO_get_accuracy;
-+              X509_CRL_get0_by_serial;
-+              TS_TST_INFO_set_version;
-+              TS_RESP_CTX_get_tst_info;
-+              TS_RESP_verify_signature;
-+              CRYPTO_THREADID_get_callback;
-+              TS_TST_INFO_get_tsa;
-+              TS_STATUS_INFO_new;
-+              EVP_PKEY_CTX_get_cb;
-+              TS_REQ_get_ext_d2i;
-+              GENERAL_NAME_set0_othername;
-+              TS_TST_INFO_get_ext_count;
-+              TS_RESP_CTX_get_request;
-+              i2d_NETSCAPE_X509;
-+              ENGINE_get_pkey_meth_engine;
-+              EVP_PKEY_meth_set_signctx;
-+              EVP_PKEY_asn1_copy;
-+              ASN1_TYPE_cmp;
-+              EVP_CIPHER_do_all_sorted;
-+              EVP_PKEY_CTX_free;
-+              ISSUING_DIST_POINT_it;
-+              d2i_TS_MSG_IMPRINT_fp;
-+              X509_STORE_get1_certs;
-+              EVP_PKEY_CTX_get_operation;
-+              d2i_ESS_SIGNING_CERT;
-+              TS_CONF_set_ordering;
-+              EVP_PBE_alg_add_type;
-+              TS_REQ_set_version;
-+              EVP_PKEY_get0;
-+              BIO_asn1_set_suffix;
-+              i2d_TS_STATUS_INFO;
-+              EVP_MD_do_all;
-+              TS_TST_INFO_set_accuracy;
-+              PKCS7_add_attrib_content_type;
-+              ERR_remove_thread_state;
-+              EVP_PKEY_meth_add0;
-+              TS_TST_INFO_set_tsa;
-+              EVP_PKEY_meth_new;
-+              WHIRLPOOL_Update;
-+              TS_CONF_set_accuracy;
-+              ASN1_PCTX_set_oid_flags;
-+              ESS_SIGNING_CERT_dup;
-+              d2i_TS_REQ_bio;
-+              X509_time_adj_ex;
-+              TS_RESP_CTX_add_flags;
-+              d2i_TS_STATUS_INFO;
-+              TS_MSG_IMPRINT_set_msg;
-+              BIO_asn1_get_suffix;
-+              TS_REQ_free;
-+              EVP_PKEY_meth_free;
-+              TS_REQ_get_exts;
-+              TS_RESP_CTX_set_clock_precision_digits;
-+              TS_RESP_CTX_set_clk_prec_digits;
-+              TS_RESP_CTX_add_failure_info;
-+              i2d_TS_RESP_bio;
-+              EVP_PKEY_CTX_get0_peerkey;
-+              PEM_write_bio_CMS_stream;
-+              TS_REQ_new;
-+              TS_MSG_IMPRINT_new;
-+              EVP_PKEY_meth_find;
-+              EVP_PKEY_id;
-+              TS_TST_INFO_set_serial;
-+              a2i_GENERAL_NAME;
-+              TS_CONF_set_crypto_device;
-+              EVP_PKEY_verify_init;
-+              TS_CONF_set_policies;
-+              ASN1_PCTX_new;
-+              ESS_CERT_ID_free;
-+              ENGINE_unregister_pkey_meths;
-+              TS_MSG_IMPRINT_free;
-+              TS_VERIFY_CTX_init;
-+              PKCS7_stream;
-+              TS_RESP_CTX_set_certs;
-+              TS_CONF_set_def_policy;
-+              ASN1_GENERALIZEDTIME_adj;
-+              NETSCAPE_X509_new;
-+              TS_ACCURACY_free;
-+              TS_RESP_get_tst_info;
-+              EVP_PKEY_derive_set_peer;
-+              PEM_read_bio_Parameters;
-+              TS_CONF_set_clock_precision_digits;
-+              TS_CONF_set_clk_prec_digits;
-+              ESS_ISSUER_SERIAL_dup;
-+              TS_ACCURACY_get_micros;
-+              ASN1_PCTX_get_str_flags;
-+              NAME_CONSTRAINTS_check;
-+              ASN1_BIT_STRING_check;
-+              X509_check_akid;
-+              ENGINE_unregister_pkey_asn1_meths;
-+              ENGINE_unreg_pkey_asn1_meths;
-+              ASN1_PCTX_free;
-+              PEM_write_bio_ASN1_stream;
-+              i2d_ASN1_bio_stream;
-+              TS_X509_ALGOR_print_bio;
-+              EVP_PKEY_meth_set_cleanup;
-+              EVP_PKEY_asn1_free;
-+              ESS_SIGNING_CERT_free;
-+              TS_TST_INFO_set_msg_imprint;
-+              GENERAL_NAME_cmp;
-+              d2i_ASN1_SET_ANY;
-+              ENGINE_set_pkey_meths;
-+              i2d_TS_REQ_fp;
-+              d2i_ASN1_SEQUENCE_ANY;
-+              GENERAL_NAME_get0_otherName;
-+              d2i_ESS_CERT_ID;
-+              OBJ_find_sigid_algs;
-+              EVP_PKEY_meth_set_keygen;
-+              PKCS5_PBKDF2_HMAC;
-+              EVP_PKEY_paramgen;
-+              EVP_PKEY_meth_set_paramgen;
-+              BIO_new_PKCS7;
-+              EVP_PKEY_verify_recover;
-+              TS_ext_print_bio;
-+              TS_ASN1_INTEGER_print_bio;
-+              check_defer;
-+              DSO_pathbyaddr;
-+              EVP_PKEY_set_type;
-+              TS_ACCURACY_set_micros;
-+              TS_REQ_to_TS_VERIFY_CTX;
-+              EVP_PKEY_meth_set_copy;
-+              ASN1_PCTX_set_cert_flags;
-+              TS_TST_INFO_get_ext;
-+              EVP_PKEY_asn1_set_ctrl;
-+              TS_TST_INFO_get_ext_by_critical;
-+              EVP_PKEY_CTX_new_id;
-+              TS_REQ_get_ext_by_OBJ;
-+              TS_CONF_set_signer_cert;
-+              X509_NAME_hash_old;
-+              ASN1_TIME_set_string;
-+              EVP_MD_flags;
-+              TS_RESP_CTX_free;
-+              DSAparams_dup;
-+              DHparams_dup;
-+              OCSP_REQ_CTX_add1_header;
-+              OCSP_REQ_CTX_set1_req;
-+              X509_STORE_set_verify_cb;
-+              X509_STORE_CTX_get0_current_crl;
-+              X509_STORE_CTX_get0_parent_ctx;
-+              X509_STORE_CTX_get0_current_issuer;
-+              X509_STORE_CTX_get0_cur_issuer;
-+              X509_issuer_name_hash_old;
-+              X509_subject_name_hash_old;
-+              EVP_CIPHER_CTX_copy;
-+              UI_method_get_prompt_constructor;
-+              UI_method_get_prompt_constructr;
-+              UI_method_set_prompt_constructor;
-+              UI_method_set_prompt_constructr;
-+              EVP_read_pw_string_min;
-+              CRYPTO_cts128_encrypt;
-+              CRYPTO_cts128_decrypt_block;
-+              CRYPTO_cfb128_1_encrypt;
-+              CRYPTO_cbc128_encrypt;
-+              CRYPTO_ctr128_encrypt;
-+              CRYPTO_ofb128_encrypt;
-+              CRYPTO_cts128_decrypt;
-+              CRYPTO_cts128_encrypt_block;
-+              CRYPTO_cbc128_decrypt;
-+              CRYPTO_cfb128_encrypt;
-+              CRYPTO_cfb128_8_encrypt;
-+
-+      local:
-+              *;
-+};
-+
-+
-+OPENSSL_1.0.1 {
-+      global:
-+              SSL_renegotiate_abbreviated;
-+              TLSv1_1_method;
-+              TLSv1_1_client_method;
-+              TLSv1_1_server_method;
-+              SSL_CTX_set_srp_client_pwd_callback;
-+              SSL_CTX_set_srp_client_pwd_cb;
-+              SSL_get_srp_g;
-+              SSL_CTX_set_srp_username_callback;
-+              SSL_CTX_set_srp_un_cb;
-+              SSL_get_srp_userinfo;
-+              SSL_set_srp_server_param;
-+              SSL_set_srp_server_param_pw;
-+              SSL_get_srp_N;
-+              SSL_get_srp_username;
-+              SSL_CTX_set_srp_password;
-+              SSL_CTX_set_srp_strength;
-+              SSL_CTX_set_srp_verify_param_callback;
-+              SSL_CTX_set_srp_vfy_param_cb;
-+              SSL_CTX_set_srp_cb_arg;
-+              SSL_CTX_set_srp_username;
-+              SSL_CTX_SRP_CTX_init;
-+              SSL_SRP_CTX_init;
-+              SRP_Calc_A_param;
-+              SRP_generate_server_master_secret;
-+              SRP_gen_server_master_secret;
-+              SSL_CTX_SRP_CTX_free;
-+              SRP_generate_client_master_secret;
-+              SRP_gen_client_master_secret;
-+              SSL_srp_server_param_with_username;
-+              SSL_srp_server_param_with_un;
-+              SSL_SRP_CTX_free;
-+              SSL_set_debug;
-+              SSL_SESSION_get0_peer;
-+              TLSv1_2_client_method;
-+              SSL_SESSION_set1_id_context;
-+              TLSv1_2_server_method;
-+              SSL_cache_hit;
-+              SSL_get0_kssl_ctx;
-+              SSL_set0_kssl_ctx;
-+              SSL_set_state;
-+              SSL_CIPHER_get_id;
-+              TLSv1_2_method;
-+              kssl_ctx_get0_client_princ;
-+              SSL_export_keying_material;
-+              SSL_set_tlsext_use_srtp;
-+              SSL_CTX_set_next_protos_advertised_cb;
-+              SSL_CTX_set_next_protos_adv_cb;
-+              SSL_get0_next_proto_negotiated;
-+              SSL_get_selected_srtp_profile;
-+              SSL_CTX_set_tlsext_use_srtp;
-+              SSL_select_next_proto;
-+              SSL_get_srtp_profiles;
-+              SSL_CTX_set_next_proto_select_cb;
-+              SSL_CTX_set_next_proto_sel_cb;
-+              SSL_SESSION_get_compress_id;
-+
-+              SRP_VBASE_get_by_user;
-+              SRP_Calc_server_key;
-+              SRP_create_verifier;
-+              SRP_create_verifier_BN;
-+              SRP_Calc_u;
-+              SRP_VBASE_free;
-+              SRP_Calc_client_key;
-+              SRP_get_default_gN;
-+              SRP_Calc_x;
-+              SRP_Calc_B;
-+              SRP_VBASE_new;
-+              SRP_check_known_gN_param;
-+              SRP_Calc_A;
-+              SRP_Verify_A_mod_N;
-+              SRP_VBASE_init;
-+              SRP_Verify_B_mod_N;
-+              EC_KEY_set_public_key_affine_coordinates;
-+              EC_KEY_set_pub_key_aff_coords;
-+              EVP_aes_192_ctr;
-+              EVP_PKEY_meth_get0_info;
-+              EVP_PKEY_meth_copy;
-+              ERR_add_error_vdata;
-+              EVP_aes_128_ctr;
-+              EVP_aes_256_ctr;
-+              EC_GFp_nistp224_method;
-+              EC_KEY_get_flags;
-+              RSA_padding_add_PKCS1_PSS_mgf1;
-+              EVP_aes_128_xts;
-+              EVP_aes_256_xts;
-+              EVP_aes_128_gcm;
-+              EC_KEY_clear_flags;
-+              EC_KEY_set_flags;
-+              EVP_aes_256_ccm;
-+              RSA_verify_PKCS1_PSS_mgf1;
-+              EVP_aes_128_ccm;
-+              EVP_aes_192_gcm;
-+              X509_ALGOR_set_md;
-+              RAND_init_fips;
-+              EVP_aes_256_gcm;
-+              EVP_aes_192_ccm;
-+              CMAC_CTX_copy;
-+              CMAC_CTX_free;
-+              CMAC_CTX_get0_cipher_ctx;
-+              CMAC_CTX_cleanup;
-+              CMAC_Init;
-+              CMAC_Update;
-+              CMAC_resume;
-+              CMAC_CTX_new;
-+              CMAC_Final;
-+              CRYPTO_ctr128_encrypt_ctr32;
-+              CRYPTO_gcm128_release;
-+              CRYPTO_ccm128_decrypt_ccm64;
-+              CRYPTO_ccm128_encrypt;
-+              CRYPTO_gcm128_encrypt;
-+              CRYPTO_xts128_encrypt;
-+              EVP_rc4_hmac_md5;
-+              CRYPTO_nistcts128_decrypt_block;
-+              CRYPTO_gcm128_setiv;
-+              CRYPTO_nistcts128_encrypt;
-+              EVP_aes_128_cbc_hmac_sha1;
-+              CRYPTO_gcm128_tag;
-+              CRYPTO_ccm128_encrypt_ccm64;
-+              ENGINE_load_rdrand;
-+              CRYPTO_ccm128_setiv;
-+              CRYPTO_nistcts128_encrypt_block;
-+              CRYPTO_gcm128_aad;
-+              CRYPTO_ccm128_init;
-+              CRYPTO_nistcts128_decrypt;
-+              CRYPTO_gcm128_new;
-+              CRYPTO_ccm128_tag;
-+              CRYPTO_ccm128_decrypt;
-+              CRYPTO_ccm128_aad;
-+              CRYPTO_gcm128_init;
-+              CRYPTO_gcm128_decrypt;
-+              ENGINE_load_rsax;
-+              CRYPTO_gcm128_decrypt_ctr32;
-+              CRYPTO_gcm128_encrypt_ctr32;
-+              CRYPTO_gcm128_finish;
-+              EVP_aes_256_cbc_hmac_sha1;
-+              PKCS5_pbkdf2_set;
-+              CMS_add0_recipient_password;
-+              CMS_decrypt_set1_password;
-+              CMS_RecipientInfo_set0_password;
-+              RAND_set_fips_drbg_type;
-+              X509_REQ_sign_ctx;
-+              RSA_PSS_PARAMS_new;
-+              X509_CRL_sign_ctx;
-+              X509_signature_dump;
-+              d2i_RSA_PSS_PARAMS;
-+              RSA_PSS_PARAMS_it;
-+              RSA_PSS_PARAMS_free;
-+              X509_sign_ctx;
-+              i2d_RSA_PSS_PARAMS;
-+              ASN1_item_sign_ctx;
-+              EC_GFp_nistp521_method;
-+              EC_GFp_nistp256_method;
-+              OPENSSL_stderr;
-+              OPENSSL_cpuid_setup;
-+              OPENSSL_showfatal;
-+              BIO_new_dgram_sctp;
-+              BIO_dgram_sctp_msg_waiting;
-+              BIO_dgram_sctp_wait_for_dry;
-+              BIO_s_datagram_sctp;
-+              BIO_dgram_is_sctp;
-+              BIO_dgram_sctp_notification_cb;
-+} OPENSSL_1.0.0;
-+
-+OPENSSL_1.0.1d {
-+      global:
-+              CRYPTO_memcmp;
-+} OPENSSL_1.0.1;
-+
-+OPENSSL_1.0.2 {
-+      global:
-+              SSL_CTX_set_alpn_protos;
-+              SSL_set_alpn_protos;
-+              SSL_CTX_set_alpn_select_cb;
-+              SSL_get0_alpn_selected;
-+              SSL_CTX_set_custom_cli_ext;
-+              SSL_CTX_set_custom_srv_ext;
-+              SSL_CTX_set_srv_supp_data;
-+              SSL_CTX_set_cli_supp_data;
-+              SSL_set_cert_cb;
-+              SSL_CTX_use_serverinfo;
-+              SSL_CTX_use_serverinfo_file;
-+              SSL_CTX_set_cert_cb;
-+              SSL_CTX_get0_param;
-+              SSL_get0_param;
-+              SSL_certs_clear;
-+              DTLSv1_2_method;
-+              DTLSv1_2_server_method;
-+              DTLSv1_2_client_method;
-+              DTLS_method;
-+              DTLS_server_method;
-+              DTLS_client_method;
-+              SSL_CTX_get_ssl_method;
-+              SSL_CTX_get0_certificate;
-+              SSL_CTX_get0_privatekey;
-+              SSL_COMP_set0_compression_methods;
-+              SSL_COMP_free_compression_methods;
-+              SSL_CIPHER_find;
-+              SSL_is_server;
-+              SSL_CONF_CTX_new;
-+              SSL_CONF_CTX_finish;
-+              SSL_CONF_CTX_free;
-+              SSL_CONF_CTX_set_flags;
-+              SSL_CONF_CTX_clear_flags;
-+              SSL_CONF_CTX_set1_prefix;
-+              SSL_CONF_CTX_set_ssl;
-+              SSL_CONF_CTX_set_ssl_ctx;
-+              SSL_CONF_cmd;
-+              SSL_CONF_cmd_argv;
-+              SSL_CONF_cmd_value_type;
-+              SSL_trace;
-+              SSL_CIPHER_standard_name;
-+              SSL_get_tlsa_record_byname;
-+              ASN1_TIME_diff;
-+              BIO_hex_string;
-+              CMS_RecipientInfo_get0_pkey_ctx;
-+              CMS_RecipientInfo_encrypt;
-+              CMS_SignerInfo_get0_pkey_ctx;
-+              CMS_SignerInfo_get0_md_ctx;
-+              CMS_SignerInfo_get0_signature;
-+              CMS_RecipientInfo_kari_get0_alg;
-+              CMS_RecipientInfo_kari_get0_reks;
-+              CMS_RecipientInfo_kari_get0_orig_id;
-+              CMS_RecipientInfo_kari_orig_id_cmp;
-+              CMS_RecipientEncryptedKey_get0_id;
-+              CMS_RecipientEncryptedKey_cert_cmp;
-+              CMS_RecipientInfo_kari_set0_pkey;
-+              CMS_RecipientInfo_kari_get0_ctx;
-+              CMS_RecipientInfo_kari_decrypt;
-+              CMS_SharedInfo_encode;
-+              DH_compute_key_padded;
-+              d2i_DHxparams;
-+              i2d_DHxparams;
-+              DH_get_1024_160;
-+              DH_get_2048_224;
-+              DH_get_2048_256;
-+              DH_KDF_X9_42;
-+              ECDH_KDF_X9_62;
-+              ECDSA_METHOD_new;
-+              ECDSA_METHOD_free;
-+              ECDSA_METHOD_set_app_data;
-+              ECDSA_METHOD_get_app_data;
-+              ECDSA_METHOD_set_sign;
-+              ECDSA_METHOD_set_sign_setup;
-+              ECDSA_METHOD_set_verify;
-+              ECDSA_METHOD_set_flags;
-+              ECDSA_METHOD_set_name;
-+              EVP_des_ede3_wrap;
-+              EVP_aes_128_wrap;
-+              EVP_aes_192_wrap;
-+              EVP_aes_256_wrap;
-+              EVP_aes_128_cbc_hmac_sha256;
-+              EVP_aes_256_cbc_hmac_sha256;
-+              CRYPTO_128_wrap;
-+              CRYPTO_128_unwrap;
-+              OCSP_REQ_CTX_nbio;
-+              OCSP_REQ_CTX_new;
-+              OCSP_set_max_response_length;
-+              OCSP_REQ_CTX_i2d;
-+              OCSP_REQ_CTX_nbio_d2i;
-+              OCSP_REQ_CTX_get0_mem_bio;
-+              OCSP_REQ_CTX_http;
-+              RSA_padding_add_PKCS1_OAEP_mgf1;
-+              RSA_padding_check_PKCS1_OAEP_mgf1;
-+              RSA_OAEP_PARAMS_free;
-+              RSA_OAEP_PARAMS_it;
-+              RSA_OAEP_PARAMS_new;
-+              SSL_get_sigalgs;
-+              SSL_get_shared_sigalgs;
-+              SSL_check_chain;
-+              X509_chain_up_ref;
-+              X509_http_nbio;
-+              X509_CRL_http_nbio;
-+              X509_REVOKED_dup;
-+              i2d_re_X509_tbs;
-+              X509_get0_signature;
-+              X509_get_signature_nid;
-+              X509_CRL_diff;
-+              X509_chain_check_suiteb;
-+              X509_CRL_check_suiteb;
-+              X509_check_host;
-+              X509_check_email;
-+              X509_check_ip;
-+              X509_check_ip_asc;
-+              X509_STORE_set_lookup_crls_cb;
-+              X509_STORE_CTX_get0_store;
-+              X509_VERIFY_PARAM_set1_host;
-+              X509_VERIFY_PARAM_add1_host;
-+              X509_VERIFY_PARAM_set_hostflags;
-+              X509_VERIFY_PARAM_get0_peername;
-+              X509_VERIFY_PARAM_set1_email;
-+              X509_VERIFY_PARAM_set1_ip;
-+              X509_VERIFY_PARAM_set1_ip_asc;
-+              X509_VERIFY_PARAM_get0_name;
-+              X509_VERIFY_PARAM_get_count;
-+              X509_VERIFY_PARAM_get0;
-+              X509V3_EXT_free;
-+              EC_GROUP_get_mont_data;
-+              EC_curve_nid2nist;
-+              EC_curve_nist2nid;
-+              PEM_write_bio_DHxparams;
-+              PEM_write_DHxparams;
-+              SSL_CTX_add_client_custom_ext;
-+              SSL_CTX_add_server_custom_ext;
-+              SSL_extension_supported;
-+              BUF_strnlen;
-+              sk_deep_copy;
-+              SSL_test_functions;
-+} OPENSSL_1.0.1d;
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld  2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.0 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
diff --git a/recipes-connectivity/openssl/openssl-qoriq/debian1.0.2/version-script.patch b/recipes-connectivity/openssl/openssl-qoriq/debian1.0.2/version-script.patch
deleted file mode 100644 (file)
index 29f11a2..0000000
+++ /dev/null
@@ -1,4656 +0,0 @@
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure
-===================================================================
---- openssl-1.0.2~beta1.obsolete.0.0498436515490575.orig/Configure     2014-02-24 21:02:30.000000000 +0100
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/Configure  2014-02-24 21:02:30.000000000 +0100
-@@ -1651,6 +1651,8 @@
-               }
-       }
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24 22:19:08.601827266 +0100
-@@ -0,0 +1,4608 @@
-+OPENSSL_1.0.2d {
-+      global:
-+              BIO_f_ssl;
-+              BIO_new_buffer_ssl_connect;
-+              BIO_new_ssl;
-+              BIO_new_ssl_connect;
-+              BIO_proxy_ssl_copy_session_id;
-+              BIO_ssl_copy_session_id;
-+              BIO_ssl_shutdown;
-+              d2i_SSL_SESSION;
-+              DTLSv1_client_method;
-+              DTLSv1_method;
-+              DTLSv1_server_method;
-+              ERR_load_SSL_strings;
-+              i2d_SSL_SESSION;
-+              kssl_build_principal_2;
-+              kssl_cget_tkt;
-+              kssl_check_authent;
-+              kssl_ctx_free;
-+              kssl_ctx_new;
-+              kssl_ctx_setkey;
-+              kssl_ctx_setprinc;
-+              kssl_ctx_setstring;
-+              kssl_ctx_show;
-+              kssl_err_set;
-+              kssl_krb5_free_data_contents;
-+              kssl_sget_tkt;
-+              kssl_skip_confound;
-+              kssl_validate_times;
-+              PEM_read_bio_SSL_SESSION;
-+              PEM_read_SSL_SESSION;
-+              PEM_write_bio_SSL_SESSION;
-+              PEM_write_SSL_SESSION;
-+              SSL_accept;
-+              SSL_add_client_CA;
-+              SSL_add_dir_cert_subjects_to_stack;
-+              SSL_add_dir_cert_subjs_to_stk;
-+              SSL_add_file_cert_subjects_to_stack;
-+              SSL_add_file_cert_subjs_to_stk;
-+              SSL_alert_desc_string;
-+              SSL_alert_desc_string_long;
-+              SSL_alert_type_string;
-+              SSL_alert_type_string_long;
-+              SSL_callback_ctrl;
-+              SSL_check_private_key;
-+              SSL_CIPHER_description;
-+              SSL_CIPHER_get_bits;
-+              SSL_CIPHER_get_name;
-+              SSL_CIPHER_get_version;
-+              SSL_clear;
-+              SSL_COMP_add_compression_method;
-+              SSL_COMP_get_compression_methods;
-+              SSL_COMP_get_compress_methods;
-+              SSL_COMP_get_name;
-+              SSL_connect;
-+              SSL_copy_session_id;
-+              SSL_ctrl;
-+              SSL_CTX_add_client_CA;
-+              SSL_CTX_add_session;
-+              SSL_CTX_callback_ctrl;
-+              SSL_CTX_check_private_key;
-+              SSL_CTX_ctrl;
-+              SSL_CTX_flush_sessions;
-+              SSL_CTX_free;
-+              SSL_CTX_get_cert_store;
-+              SSL_CTX_get_client_CA_list;
-+              SSL_CTX_get_client_cert_cb;
-+              SSL_CTX_get_ex_data;
-+              SSL_CTX_get_ex_new_index;
-+              SSL_CTX_get_info_callback;
-+              SSL_CTX_get_quiet_shutdown;
-+              SSL_CTX_get_timeout;
-+              SSL_CTX_get_verify_callback;
-+              SSL_CTX_get_verify_depth;
-+              SSL_CTX_get_verify_mode;
-+              SSL_CTX_load_verify_locations;
-+              SSL_CTX_new;
-+              SSL_CTX_remove_session;
-+              SSL_CTX_sess_get_get_cb;
-+              SSL_CTX_sess_get_new_cb;
-+              SSL_CTX_sess_get_remove_cb;
-+              SSL_CTX_sessions;
-+              SSL_CTX_sess_set_get_cb;
-+              SSL_CTX_sess_set_new_cb;
-+              SSL_CTX_sess_set_remove_cb;
-+              SSL_CTX_set1_param;
-+              SSL_CTX_set_cert_store;
-+              SSL_CTX_set_cert_verify_callback;
-+              SSL_CTX_set_cert_verify_cb;
-+              SSL_CTX_set_cipher_list;
-+              SSL_CTX_set_client_CA_list;
-+              SSL_CTX_set_client_cert_cb;
-+              SSL_CTX_set_client_cert_engine;
-+              SSL_CTX_set_cookie_generate_cb;
-+              SSL_CTX_set_cookie_verify_cb;
-+              SSL_CTX_set_default_passwd_cb;
-+              SSL_CTX_set_default_passwd_cb_userdata;
-+              SSL_CTX_set_default_verify_paths;
-+              SSL_CTX_set_def_passwd_cb_ud;
-+              SSL_CTX_set_def_verify_paths;
-+              SSL_CTX_set_ex_data;
-+              SSL_CTX_set_generate_session_id;
-+              SSL_CTX_set_info_callback;
-+              SSL_CTX_set_msg_callback;
-+              SSL_CTX_set_psk_client_callback;
-+              SSL_CTX_set_psk_server_callback;
-+              SSL_CTX_set_purpose;
-+              SSL_CTX_set_quiet_shutdown;
-+              SSL_CTX_set_session_id_context;
-+              SSL_CTX_set_ssl_version;
-+              SSL_CTX_set_timeout;
-+              SSL_CTX_set_tmp_dh_callback;
-+              SSL_CTX_set_tmp_ecdh_callback;
-+              SSL_CTX_set_tmp_rsa_callback;
-+              SSL_CTX_set_trust;
-+              SSL_CTX_set_verify;
-+              SSL_CTX_set_verify_depth;
-+              SSL_CTX_use_cert_chain_file;
-+              SSL_CTX_use_certificate;
-+              SSL_CTX_use_certificate_ASN1;
-+              SSL_CTX_use_certificate_chain_file;
-+              SSL_CTX_use_certificate_file;
-+              SSL_CTX_use_PrivateKey;
-+              SSL_CTX_use_PrivateKey_ASN1;
-+              SSL_CTX_use_PrivateKey_file;
-+              SSL_CTX_use_psk_identity_hint;
-+              SSL_CTX_use_RSAPrivateKey;
-+              SSL_CTX_use_RSAPrivateKey_ASN1;
-+              SSL_CTX_use_RSAPrivateKey_file;
-+              SSL_do_handshake;
-+              SSL_dup;
-+              SSL_dup_CA_list;
-+              SSLeay_add_ssl_algorithms;
-+              SSL_free;
-+              SSL_get1_session;
-+              SSL_get_certificate;
-+              SSL_get_cipher_list;
-+              SSL_get_ciphers;
-+              SSL_get_client_CA_list;
-+              SSL_get_current_cipher;
-+              SSL_get_current_compression;
-+              SSL_get_current_expansion;
-+              SSL_get_default_timeout;
-+              SSL_get_error;
-+              SSL_get_ex_data;
-+              SSL_get_ex_data_X509_STORE_CTX_idx;
-+              SSL_get_ex_d_X509_STORE_CTX_idx;
-+              SSL_get_ex_new_index;
-+              SSL_get_fd;
-+              SSL_get_finished;
-+              SSL_get_info_callback;
-+              SSL_get_peer_cert_chain;
-+              SSL_get_peer_certificate;
-+              SSL_get_peer_finished;
-+              SSL_get_privatekey;
-+              SSL_get_psk_identity;
-+              SSL_get_psk_identity_hint;
-+              SSL_get_quiet_shutdown;
-+              SSL_get_rbio;
-+              SSL_get_read_ahead;
-+              SSL_get_rfd;
-+              SSL_get_servername;
-+              SSL_get_servername_type;
-+              SSL_get_session;
-+              SSL_get_shared_ciphers;
-+              SSL_get_shutdown;
-+              SSL_get_SSL_CTX;
-+              SSL_get_ssl_method;
-+              SSL_get_verify_callback;
-+              SSL_get_verify_depth;
-+              SSL_get_verify_mode;
-+              SSL_get_verify_result;
-+              SSL_get_version;
-+              SSL_get_wbio;
-+              SSL_get_wfd;
-+              SSL_has_matching_session_id;
-+              SSL_library_init;
-+              SSL_load_client_CA_file;
-+              SSL_load_error_strings;
-+              SSL_new;
-+              SSL_peek;
-+              SSL_pending;
-+              SSL_read;
-+              SSL_renegotiate;
-+              SSL_renegotiate_pending;
-+              SSL_rstate_string;
-+              SSL_rstate_string_long;
-+              SSL_SESSION_cmp;
-+              SSL_SESSION_free;
-+              SSL_SESSION_get_ex_data;
-+              SSL_SESSION_get_ex_new_index;
-+              SSL_SESSION_get_id;
-+              SSL_SESSION_get_time;
-+              SSL_SESSION_get_timeout;
-+              SSL_SESSION_hash;
-+              SSL_SESSION_new;
-+              SSL_SESSION_print;
-+              SSL_SESSION_print_fp;
-+              SSL_SESSION_set_ex_data;
-+              SSL_SESSION_set_time;
-+              SSL_SESSION_set_timeout;
-+              SSL_set1_param;
-+              SSL_set_accept_state;
-+              SSL_set_bio;
-+              SSL_set_cipher_list;
-+              SSL_set_client_CA_list;
-+              SSL_set_connect_state;
-+              SSL_set_ex_data;
-+              SSL_set_fd;
-+              SSL_set_generate_session_id;
-+              SSL_set_info_callback;
-+              SSL_set_msg_callback;
-+              SSL_set_psk_client_callback;
-+              SSL_set_psk_server_callback;
-+              SSL_set_purpose;
-+              SSL_set_quiet_shutdown;
-+              SSL_set_read_ahead;
-+              SSL_set_rfd;
-+              SSL_set_session;
-+              SSL_set_session_id_context;
-+              SSL_set_session_secret_cb;
-+              SSL_set_session_ticket_ext;
-+              SSL_set_session_ticket_ext_cb;
-+              SSL_set_shutdown;
-+              SSL_set_SSL_CTX;
-+              SSL_set_ssl_method;
-+              SSL_set_tmp_dh_callback;
-+              SSL_set_tmp_ecdh_callback;
-+              SSL_set_tmp_rsa_callback;
-+              SSL_set_trust;
-+              SSL_set_verify;
-+              SSL_set_verify_depth;
-+              SSL_set_verify_result;
-+              SSL_set_wfd;
-+              SSL_shutdown;
-+              SSL_state;
-+              SSL_state_string;
-+              SSL_state_string_long;
-+              SSL_use_certificate;
-+              SSL_use_certificate_ASN1;
-+              SSL_use_certificate_file;
-+              SSL_use_PrivateKey;
-+              SSL_use_PrivateKey_ASN1;
-+              SSL_use_PrivateKey_file;
-+              SSL_use_psk_identity_hint;
-+              SSL_use_RSAPrivateKey;
-+              SSL_use_RSAPrivateKey_ASN1;
-+              SSL_use_RSAPrivateKey_file;
-+              SSLv23_client_method;
-+              SSLv23_method;
-+              SSLv23_server_method;
-+              SSLv2_client_method;
-+              SSLv2_method;
-+              SSLv2_server_method;
-+              SSLv3_client_method;
-+              SSLv3_method;
-+              SSLv3_server_method;
-+              SSL_version;
-+              SSL_want;
-+              SSL_write;
-+              TLSv1_client_method;
-+              TLSv1_method;
-+              TLSv1_server_method;
-+
-+
-+              SSLeay;
-+              SSLeay_version;
-+              ASN1_BIT_STRING_asn1_meth;
-+              ASN1_HEADER_free;
-+              ASN1_HEADER_new;
-+              ASN1_IA5STRING_asn1_meth;
-+              ASN1_INTEGER_get;
-+              ASN1_INTEGER_set;
-+              ASN1_INTEGER_to_BN;
-+              ASN1_OBJECT_create;
-+              ASN1_OBJECT_free;
-+              ASN1_OBJECT_new;
-+              ASN1_PRINTABLE_type;
-+              ASN1_STRING_cmp;
-+              ASN1_STRING_dup;
-+              ASN1_STRING_free;
-+              ASN1_STRING_new;
-+              ASN1_STRING_print;
-+              ASN1_STRING_set;
-+              ASN1_STRING_type_new;
-+              ASN1_TYPE_free;
-+              ASN1_TYPE_new;
-+              ASN1_UNIVERSALSTRING_to_string;
-+              ASN1_UTCTIME_check;
-+              ASN1_UTCTIME_print;
-+              ASN1_UTCTIME_set;
-+              ASN1_check_infinite_end;
-+              ASN1_d2i_bio;
-+              ASN1_d2i_fp;
-+              ASN1_digest;
-+              ASN1_dup;
-+              ASN1_get_object;
-+              ASN1_i2d_bio;
-+              ASN1_i2d_fp;
-+              ASN1_object_size;
-+              ASN1_parse;
-+              ASN1_put_object;
-+              ASN1_sign;
-+              ASN1_verify;
-+              BF_cbc_encrypt;
-+              BF_cfb64_encrypt;
-+              BF_ecb_encrypt;
-+              BF_encrypt;
-+              BF_ofb64_encrypt;
-+              BF_options;
-+              BF_set_key;
-+              BIO_CONNECT_free;
-+              BIO_CONNECT_new;
-+              BIO_accept;
-+              BIO_ctrl;
-+              BIO_int_ctrl;
-+              BIO_debug_callback;
-+              BIO_dump;
-+              BIO_dup_chain;
-+              BIO_f_base64;
-+              BIO_f_buffer;
-+              BIO_f_cipher;
-+              BIO_f_md;
-+              BIO_f_null;
-+              BIO_f_proxy_server;
-+              BIO_fd_non_fatal_error;
-+              BIO_fd_should_retry;
-+              BIO_find_type;
-+              BIO_free;
-+              BIO_free_all;
-+              BIO_get_accept_socket;
-+              BIO_get_filter_bio;
-+              BIO_get_host_ip;
-+              BIO_get_port;
-+              BIO_get_retry_BIO;
-+              BIO_get_retry_reason;
-+              BIO_gethostbyname;
-+              BIO_gets;
-+              BIO_new;
-+              BIO_new_accept;
-+              BIO_new_connect;
-+              BIO_new_fd;
-+              BIO_new_file;
-+              BIO_new_fp;
-+              BIO_new_socket;
-+              BIO_pop;
-+              BIO_printf;
-+              BIO_push;
-+              BIO_puts;
-+              BIO_read;
-+              BIO_s_accept;
-+              BIO_s_connect;
-+              BIO_s_fd;
-+              BIO_s_file;
-+              BIO_s_mem;
-+              BIO_s_null;
-+              BIO_s_proxy_client;
-+              BIO_s_socket;
-+              BIO_set;
-+              BIO_set_cipher;
-+              BIO_set_tcp_ndelay;
-+              BIO_sock_cleanup;
-+              BIO_sock_error;
-+              BIO_sock_init;
-+              BIO_sock_non_fatal_error;
-+              BIO_sock_should_retry;
-+              BIO_socket_ioctl;
-+              BIO_write;
-+              BN_CTX_free;
-+              BN_CTX_new;
-+              BN_MONT_CTX_free;
-+              BN_MONT_CTX_new;
-+              BN_MONT_CTX_set;
-+              BN_add;
-+              BN_add_word;
-+              BN_hex2bn;
-+              BN_bin2bn;
-+              BN_bn2hex;
-+              BN_bn2bin;
-+              BN_clear;
-+              BN_clear_bit;
-+              BN_clear_free;
-+              BN_cmp;
-+              BN_copy;
-+              BN_div;
-+              BN_div_word;
-+              BN_dup;
-+              BN_free;
-+              BN_from_montgomery;
-+              BN_gcd;
-+              BN_generate_prime;
-+              BN_get_word;
-+              BN_is_bit_set;
-+              BN_is_prime;
-+              BN_lshift;
-+              BN_lshift1;
-+              BN_mask_bits;
-+              BN_mod;
-+              BN_mod_exp;
-+              BN_mod_exp_mont;
-+              BN_mod_exp_simple;
-+              BN_mod_inverse;
-+              BN_mod_mul;
-+              BN_mod_mul_montgomery;
-+              BN_mod_word;
-+              BN_mul;
-+              BN_new;
-+              BN_num_bits;
-+              BN_num_bits_word;
-+              BN_options;
-+              BN_print;
-+              BN_print_fp;
-+              BN_rand;
-+              BN_reciprocal;
-+              BN_rshift;
-+              BN_rshift1;
-+              BN_set_bit;
-+              BN_set_word;
-+              BN_sqr;
-+              BN_sub;
-+              BN_to_ASN1_INTEGER;
-+              BN_ucmp;
-+              BN_value_one;
-+              BUF_MEM_free;
-+              BUF_MEM_grow;
-+              BUF_MEM_new;
-+              BUF_strdup;
-+              CONF_free;
-+              CONF_get_number;
-+              CONF_get_section;
-+              CONF_get_string;
-+              CONF_load;
-+              CRYPTO_add_lock;
-+              CRYPTO_dbg_free;
-+              CRYPTO_dbg_malloc;
-+              CRYPTO_dbg_realloc;
-+              CRYPTO_dbg_remalloc;
-+              CRYPTO_free;
-+              CRYPTO_get_add_lock_callback;
-+              CRYPTO_get_id_callback;
-+              CRYPTO_get_lock_name;
-+              CRYPTO_get_locking_callback;
-+              CRYPTO_get_mem_functions;
-+              CRYPTO_lock;
-+              CRYPTO_malloc;
-+              CRYPTO_mem_ctrl;
-+              CRYPTO_mem_leaks;
-+              CRYPTO_mem_leaks_cb;
-+              CRYPTO_mem_leaks_fp;
-+              CRYPTO_realloc;
-+              CRYPTO_remalloc;
-+              CRYPTO_set_add_lock_callback;
-+              CRYPTO_set_id_callback;
-+              CRYPTO_set_locking_callback;
-+              CRYPTO_set_mem_functions;
-+              CRYPTO_thread_id;
-+              DH_check;
-+              DH_compute_key;
-+              DH_free;
-+              DH_generate_key;
-+              DH_generate_parameters;
-+              DH_new;
-+              DH_size;
-+              DHparams_print;
-+              DHparams_print_fp;
-+              DSA_free;
-+              DSA_generate_key;
-+              DSA_generate_parameters;
-+              DSA_is_prime;
-+              DSA_new;
-+              DSA_print;
-+              DSA_print_fp;
-+              DSA_sign;
-+              DSA_sign_setup;
-+              DSA_size;
-+              DSA_verify;
-+              DSAparams_print;
-+              DSAparams_print_fp;
-+              ERR_clear_error;
-+              ERR_error_string;
-+              ERR_free_strings;
-+              ERR_func_error_string;
-+              ERR_get_err_state_table;
-+              ERR_get_error;
-+              ERR_get_error_line;
-+              ERR_get_state;
-+              ERR_get_string_table;
-+              ERR_lib_error_string;
-+              ERR_load_ASN1_strings;
-+              ERR_load_BIO_strings;
-+              ERR_load_BN_strings;
-+              ERR_load_BUF_strings;
-+              ERR_load_CONF_strings;
-+              ERR_load_DH_strings;
-+              ERR_load_DSA_strings;
-+              ERR_load_ERR_strings;
-+              ERR_load_EVP_strings;
-+              ERR_load_OBJ_strings;
-+              ERR_load_PEM_strings;
-+              ERR_load_PROXY_strings;
-+              ERR_load_RSA_strings;
-+              ERR_load_X509_strings;
-+              ERR_load_crypto_strings;
-+              ERR_load_strings;
-+              ERR_peek_error;
-+              ERR_peek_error_line;
-+              ERR_print_errors;
-+              ERR_print_errors_fp;
-+              ERR_put_error;
-+              ERR_reason_error_string;
-+              ERR_remove_state;
-+              EVP_BytesToKey;
-+              EVP_CIPHER_CTX_cleanup;
-+              EVP_CipherFinal;
-+              EVP_CipherInit;
-+              EVP_CipherUpdate;
-+              EVP_DecodeBlock;
-+              EVP_DecodeFinal;
-+              EVP_DecodeInit;
-+              EVP_DecodeUpdate;
-+              EVP_DecryptFinal;
-+              EVP_DecryptInit;
-+              EVP_DecryptUpdate;
-+              EVP_DigestFinal;
-+              EVP_DigestInit;
-+              EVP_DigestUpdate;
-+              EVP_EncodeBlock;
-+              EVP_EncodeFinal;
-+              EVP_EncodeInit;
-+              EVP_EncodeUpdate;
-+              EVP_EncryptFinal;
-+              EVP_EncryptInit;
-+              EVP_EncryptUpdate;
-+              EVP_OpenFinal;
-+              EVP_OpenInit;
-+              EVP_PKEY_assign;
-+              EVP_PKEY_copy_parameters;
-+              EVP_PKEY_free;
-+              EVP_PKEY_missing_parameters;
-+              EVP_PKEY_new;
-+              EVP_PKEY_save_parameters;
-+              EVP_PKEY_size;
-+              EVP_PKEY_type;
-+              EVP_SealFinal;
-+              EVP_SealInit;
-+              EVP_SignFinal;
-+              EVP_VerifyFinal;
-+              EVP_add_alias;
-+              EVP_add_cipher;
-+              EVP_add_digest;
-+              EVP_bf_cbc;
-+              EVP_bf_cfb64;
-+              EVP_bf_ecb;
-+              EVP_bf_ofb;
-+              EVP_cleanup;
-+              EVP_des_cbc;
-+              EVP_des_cfb64;
-+              EVP_des_ecb;
-+              EVP_des_ede;
-+              EVP_des_ede3;
-+              EVP_des_ede3_cbc;
-+              EVP_des_ede3_cfb64;
-+              EVP_des_ede3_ofb;
-+              EVP_des_ede_cbc;
-+              EVP_des_ede_cfb64;
-+              EVP_des_ede_ofb;
-+              EVP_des_ofb;
-+              EVP_desx_cbc;
-+              EVP_dss;
-+              EVP_dss1;
-+              EVP_enc_null;
-+              EVP_get_cipherbyname;
-+              EVP_get_digestbyname;
-+              EVP_get_pw_prompt;
-+              EVP_idea_cbc;
-+              EVP_idea_cfb64;
-+              EVP_idea_ecb;
-+              EVP_idea_ofb;
-+              EVP_md2;
-+              EVP_md5;
-+              EVP_md_null;
-+              EVP_rc2_cbc;
-+              EVP_rc2_cfb64;
-+              EVP_rc2_ecb;
-+              EVP_rc2_ofb;
-+              EVP_rc4;
-+              EVP_read_pw_string;
-+              EVP_set_pw_prompt;
-+              EVP_sha;
-+              EVP_sha1;
-+              MD2;
-+              MD2_Final;
-+              MD2_Init;
-+              MD2_Update;
-+              MD2_options;
-+              MD5;
-+              MD5_Final;
-+              MD5_Init;
-+              MD5_Update;
-+              MDC2;
-+              MDC2_Final;
-+              MDC2_Init;
-+              MDC2_Update;
-+              NETSCAPE_SPKAC_free;
-+              NETSCAPE_SPKAC_new;
-+              NETSCAPE_SPKI_free;
-+              NETSCAPE_SPKI_new;
-+              NETSCAPE_SPKI_sign;
-+              NETSCAPE_SPKI_verify;
-+              OBJ_add_object;
-+              OBJ_bsearch;
-+              OBJ_cleanup;
-+              OBJ_cmp;
-+              OBJ_create;
-+              OBJ_dup;
-+              OBJ_ln2nid;
-+              OBJ_new_nid;
-+              OBJ_nid2ln;
-+              OBJ_nid2obj;
-+              OBJ_nid2sn;
-+              OBJ_obj2nid;
-+              OBJ_sn2nid;
-+              OBJ_txt2nid;
-+              PEM_ASN1_read;
-+              PEM_ASN1_read_bio;
-+              PEM_ASN1_write;
-+              PEM_ASN1_write_bio;
-+              PEM_SealFinal;
-+              PEM_SealInit;
-+              PEM_SealUpdate;
-+              PEM_SignFinal;
-+              PEM_SignInit;
-+              PEM_SignUpdate;
-+              PEM_X509_INFO_read;
-+              PEM_X509_INFO_read_bio;
-+              PEM_X509_INFO_write_bio;
-+              PEM_dek_info;
-+              PEM_do_header;
-+              PEM_get_EVP_CIPHER_INFO;
-+              PEM_proc_type;
-+              PEM_read;
-+              PEM_read_DHparams;
-+              PEM_read_DSAPrivateKey;
-+              PEM_read_DSAparams;
-+              PEM_read_PKCS7;
-+              PEM_read_PrivateKey;
-+              PEM_read_RSAPrivateKey;
-+              PEM_read_X509;
-+              PEM_read_X509_CRL;
-+              PEM_read_X509_REQ;
-+              PEM_read_bio;
-+              PEM_read_bio_DHparams;
-+              PEM_read_bio_DSAPrivateKey;
-+              PEM_read_bio_DSAparams;
-+              PEM_read_bio_PKCS7;
-+              PEM_read_bio_PrivateKey;
-+              PEM_read_bio_RSAPrivateKey;
-+              PEM_read_bio_X509;
-+              PEM_read_bio_X509_CRL;
-+              PEM_read_bio_X509_REQ;
-+              PEM_write;
-+              PEM_write_DHparams;
-+              PEM_write_DSAPrivateKey;
-+              PEM_write_DSAparams;
-+              PEM_write_PKCS7;
-+              PEM_write_PrivateKey;
-+              PEM_write_RSAPrivateKey;
-+              PEM_write_X509;
-+              PEM_write_X509_CRL;
-+              PEM_write_X509_REQ;
-+              PEM_write_bio;
-+              PEM_write_bio_DHparams;
-+              PEM_write_bio_DSAPrivateKey;
-+              PEM_write_bio_DSAparams;
-+              PEM_write_bio_PKCS7;
-+              PEM_write_bio_PrivateKey;
-+              PEM_write_bio_RSAPrivateKey;
-+              PEM_write_bio_X509;
-+              PEM_write_bio_X509_CRL;
-+              PEM_write_bio_X509_REQ;
-+              PKCS7_DIGEST_free;
-+              PKCS7_DIGEST_new;
-+              PKCS7_ENCRYPT_free;
-+              PKCS7_ENCRYPT_new;
-+              PKCS7_ENC_CONTENT_free;
-+              PKCS7_ENC_CONTENT_new;
-+              PKCS7_ENVELOPE_free;
-+              PKCS7_ENVELOPE_new;
-+              PKCS7_ISSUER_AND_SERIAL_digest;
-+              PKCS7_ISSUER_AND_SERIAL_free;
-+              PKCS7_ISSUER_AND_SERIAL_new;
-+              PKCS7_RECIP_INFO_free;
-+              PKCS7_RECIP_INFO_new;
-+              PKCS7_SIGNED_free;
-+              PKCS7_SIGNED_new;
-+              PKCS7_SIGNER_INFO_free;
-+              PKCS7_SIGNER_INFO_new;
-+              PKCS7_SIGN_ENVELOPE_free;
-+              PKCS7_SIGN_ENVELOPE_new;
-+              PKCS7_dup;
-+              PKCS7_free;
-+              PKCS7_new;
-+              PROXY_ENTRY_add_noproxy;
-+              PROXY_ENTRY_clear_noproxy;
-+              PROXY_ENTRY_free;
-+              PROXY_ENTRY_get_noproxy;
-+              PROXY_ENTRY_new;
-+              PROXY_ENTRY_set_server;
-+              PROXY_add_noproxy;
-+              PROXY_add_server;
-+              PROXY_check_by_host;
-+              PROXY_check_url;
-+              PROXY_clear_noproxy;
-+              PROXY_free;
-+              PROXY_get_noproxy;
-+              PROXY_get_proxies;
-+              PROXY_get_proxy_entry;
-+              PROXY_load_conf;
-+              PROXY_new;
-+              PROXY_print;
-+              RAND_bytes;
-+              RAND_cleanup;
-+              RAND_file_name;
-+              RAND_load_file;
-+              RAND_screen;
-+              RAND_seed;
-+              RAND_write_file;
-+              RC2_cbc_encrypt;
-+              RC2_cfb64_encrypt;
-+              RC2_ecb_encrypt;
-+              RC2_encrypt;
-+              RC2_ofb64_encrypt;
-+              RC2_set_key;
-+              RC4;
-+              RC4_options;
-+              RC4_set_key;
-+              RSAPrivateKey_asn1_meth;
-+              RSAPrivateKey_dup;
-+              RSAPublicKey_dup;
-+              RSA_PKCS1_SSLeay;
-+              RSA_free;
-+              RSA_generate_key;
-+              RSA_new;
-+              RSA_new_method;
-+              RSA_print;
-+              RSA_print_fp;
-+              RSA_private_decrypt;
-+              RSA_private_encrypt;
-+              RSA_public_decrypt;
-+              RSA_public_encrypt;
-+              RSA_set_default_method;
-+              RSA_sign;
-+              RSA_sign_ASN1_OCTET_STRING;
-+              RSA_size;
-+              RSA_verify;
-+              RSA_verify_ASN1_OCTET_STRING;
-+              SHA;
-+              SHA1;
-+              SHA1_Final;
-+              SHA1_Init;
-+              SHA1_Update;
-+              SHA_Final;
-+              SHA_Init;
-+              SHA_Update;
-+              OpenSSL_add_all_algorithms;
-+              OpenSSL_add_all_ciphers;
-+              OpenSSL_add_all_digests;
-+              TXT_DB_create_index;
-+              TXT_DB_free;
-+              TXT_DB_get_by_index;
-+              TXT_DB_insert;
-+              TXT_DB_read;
-+              TXT_DB_write;
-+              X509_ALGOR_free;
-+              X509_ALGOR_new;
-+              X509_ATTRIBUTE_free;
-+              X509_ATTRIBUTE_new;
-+              X509_CINF_free;
-+              X509_CINF_new;
-+              X509_CRL_INFO_free;
-+              X509_CRL_INFO_new;
-+              X509_CRL_add_ext;
-+              X509_CRL_cmp;
-+              X509_CRL_delete_ext;
-+              X509_CRL_dup;
-+              X509_CRL_free;
-+              X509_CRL_get_ext;
-+              X509_CRL_get_ext_by_NID;
-+              X509_CRL_get_ext_by_OBJ;
-+              X509_CRL_get_ext_by_critical;
-+              X509_CRL_get_ext_count;
-+              X509_CRL_new;
-+              X509_CRL_sign;
-+              X509_CRL_verify;
-+              X509_EXTENSION_create_by_NID;
-+              X509_EXTENSION_create_by_OBJ;
-+              X509_EXTENSION_dup;
-+              X509_EXTENSION_free;
-+              X509_EXTENSION_get_critical;
-+              X509_EXTENSION_get_data;
-+              X509_EXTENSION_get_object;
-+              X509_EXTENSION_new;
-+              X509_EXTENSION_set_critical;
-+              X509_EXTENSION_set_data;
-+              X509_EXTENSION_set_object;
-+              X509_INFO_free;
-+              X509_INFO_new;
-+              X509_LOOKUP_by_alias;
-+              X509_LOOKUP_by_fingerprint;
-+              X509_LOOKUP_by_issuer_serial;
-+              X509_LOOKUP_by_subject;
-+              X509_LOOKUP_ctrl;
-+              X509_LOOKUP_file;
-+              X509_LOOKUP_free;
-+              X509_LOOKUP_hash_dir;
-+              X509_LOOKUP_init;
-+              X509_LOOKUP_new;
-+              X509_LOOKUP_shutdown;
-+              X509_NAME_ENTRY_create_by_NID;
-+              X509_NAME_ENTRY_create_by_OBJ;
-+              X509_NAME_ENTRY_dup;
-+              X509_NAME_ENTRY_free;
-+              X509_NAME_ENTRY_get_data;
-+              X509_NAME_ENTRY_get_object;
-+              X509_NAME_ENTRY_new;
-+              X509_NAME_ENTRY_set_data;
-+              X509_NAME_ENTRY_set_object;
-+              X509_NAME_add_entry;
-+              X509_NAME_cmp;
-+              X509_NAME_delete_entry;
-+              X509_NAME_digest;
-+              X509_NAME_dup;
-+              X509_NAME_entry_count;
-+              X509_NAME_free;
-+              X509_NAME_get_entry;
-+              X509_NAME_get_index_by_NID;
-+              X509_NAME_get_index_by_OBJ;
-+              X509_NAME_get_text_by_NID;
-+              X509_NAME_get_text_by_OBJ;
-+              X509_NAME_hash;
-+              X509_NAME_new;
-+              X509_NAME_oneline;
-+              X509_NAME_print;
-+              X509_NAME_set;
-+              X509_OBJECT_free_contents;
-+              X509_OBJECT_retrieve_by_subject;
-+              X509_OBJECT_up_ref_count;
-+              X509_PKEY_free;
-+              X509_PKEY_new;
-+              X509_PUBKEY_free;
-+              X509_PUBKEY_get;
-+              X509_PUBKEY_new;
-+              X509_PUBKEY_set;
-+              X509_REQ_INFO_free;
-+              X509_REQ_INFO_new;
-+              X509_REQ_dup;
-+              X509_REQ_free;
-+              X509_REQ_get_pubkey;
-+              X509_REQ_new;
-+              X509_REQ_print;
-+              X509_REQ_print_fp;
-+              X509_REQ_set_pubkey;
-+              X509_REQ_set_subject_name;
-+              X509_REQ_set_version;
-+              X509_REQ_sign;
-+              X509_REQ_to_X509;
-+              X509_REQ_verify;
-+              X509_REVOKED_add_ext;
-+              X509_REVOKED_delete_ext;
-+              X509_REVOKED_free;
-+              X509_REVOKED_get_ext;
-+              X509_REVOKED_get_ext_by_NID;
-+              X509_REVOKED_get_ext_by_OBJ;
-+              X509_REVOKED_get_ext_by_critical;
-+              X509_REVOKED_get_ext_by_critic;
-+              X509_REVOKED_get_ext_count;
-+              X509_REVOKED_new;
-+              X509_SIG_free;
-+              X509_SIG_new;
-+              X509_STORE_CTX_cleanup;
-+              X509_STORE_CTX_init;
-+              X509_STORE_add_cert;
-+              X509_STORE_add_lookup;
-+              X509_STORE_free;
-+              X509_STORE_get_by_subject;
-+              X509_STORE_load_locations;
-+              X509_STORE_new;
-+              X509_STORE_set_default_paths;
-+              X509_VAL_free;
-+              X509_VAL_new;
-+              X509_add_ext;
-+              X509_asn1_meth;
-+              X509_certificate_type;
-+              X509_check_private_key;
-+              X509_cmp_current_time;
-+              X509_delete_ext;
-+              X509_digest;
-+              X509_dup;
-+              X509_free;
-+              X509_get_default_cert_area;
-+              X509_get_default_cert_dir;
-+              X509_get_default_cert_dir_env;
-+              X509_get_default_cert_file;
-+              X509_get_default_cert_file_env;
-+              X509_get_default_private_dir;
-+              X509_get_ext;
-+              X509_get_ext_by_NID;
-+              X509_get_ext_by_OBJ;
-+              X509_get_ext_by_critical;
-+              X509_get_ext_count;
-+              X509_get_issuer_name;
-+              X509_get_pubkey;
-+              X509_get_pubkey_parameters;
-+              X509_get_serialNumber;
-+              X509_get_subject_name;
-+              X509_gmtime_adj;
-+              X509_issuer_and_serial_cmp;
-+              X509_issuer_and_serial_hash;
-+              X509_issuer_name_cmp;
-+              X509_issuer_name_hash;
-+              X509_load_cert_file;
-+              X509_new;
-+              X509_print;
-+              X509_print_fp;
-+              X509_set_issuer_name;
-+              X509_set_notAfter;
-+              X509_set_notBefore;
-+              X509_set_pubkey;
-+              X509_set_serialNumber;
-+              X509_set_subject_name;
-+              X509_set_version;
-+              X509_sign;
-+              X509_subject_name_cmp;
-+              X509_subject_name_hash;
-+              X509_to_X509_REQ;
-+              X509_verify;
-+              X509_verify_cert;
-+              X509_verify_cert_error_string;
-+              X509v3_add_ext;
-+              X509v3_add_extension;
-+              X509v3_add_netscape_extensions;
-+              X509v3_add_standard_extensions;
-+              X509v3_cleanup_extensions;
-+              X509v3_data_type_by_NID;
-+              X509v3_data_type_by_OBJ;
-+              X509v3_delete_ext;
-+              X509v3_get_ext;
-+              X509v3_get_ext_by_NID;
-+              X509v3_get_ext_by_OBJ;
-+              X509v3_get_ext_by_critical;
-+              X509v3_get_ext_count;
-+              X509v3_pack_string;
-+              X509v3_pack_type_by_NID;
-+              X509v3_pack_type_by_OBJ;
-+              X509v3_unpack_string;
-+              _des_crypt;
-+              a2d_ASN1_OBJECT;
-+              a2i_ASN1_INTEGER;
-+              a2i_ASN1_STRING;
-+              asn1_Finish;
-+              asn1_GetSequence;
-+              bn_div_words;
-+              bn_expand2;
-+              bn_mul_add_words;
-+              bn_mul_words;
-+              BN_uadd;
-+              BN_usub;
-+              bn_sqr_words;
-+              _ossl_old_crypt;
-+              d2i_ASN1_BIT_STRING;
-+              d2i_ASN1_BOOLEAN;
-+              d2i_ASN1_HEADER;
-+              d2i_ASN1_IA5STRING;
-+              d2i_ASN1_INTEGER;
-+              d2i_ASN1_OBJECT;
-+              d2i_ASN1_OCTET_STRING;
-+              d2i_ASN1_PRINTABLE;
-+              d2i_ASN1_PRINTABLESTRING;
-+              d2i_ASN1_SET;
-+              d2i_ASN1_T61STRING;
-+              d2i_ASN1_TYPE;
-+              d2i_ASN1_UTCTIME;
-+              d2i_ASN1_bytes;
-+              d2i_ASN1_type_bytes;
-+              d2i_DHparams;
-+              d2i_DSAPrivateKey;
-+              d2i_DSAPrivateKey_bio;
-+              d2i_DSAPrivateKey_fp;
-+              d2i_DSAPublicKey;
-+              d2i_DSAparams;
-+              d2i_NETSCAPE_SPKAC;
-+              d2i_NETSCAPE_SPKI;
-+              d2i_Netscape_RSA;
-+              d2i_PKCS7;
-+              d2i_PKCS7_DIGEST;
-+              d2i_PKCS7_ENCRYPT;
-+              d2i_PKCS7_ENC_CONTENT;
-+              d2i_PKCS7_ENVELOPE;
-+              d2i_PKCS7_ISSUER_AND_SERIAL;
-+              d2i_PKCS7_RECIP_INFO;
-+              d2i_PKCS7_SIGNED;
-+              d2i_PKCS7_SIGNER_INFO;
-+              d2i_PKCS7_SIGN_ENVELOPE;
-+              d2i_PKCS7_bio;
-+              d2i_PKCS7_fp;
-+              d2i_PrivateKey;
-+              d2i_PublicKey;
-+              d2i_RSAPrivateKey;
-+              d2i_RSAPrivateKey_bio;
-+              d2i_RSAPrivateKey_fp;
-+              d2i_RSAPublicKey;
-+              d2i_X509;
-+              d2i_X509_ALGOR;
-+              d2i_X509_ATTRIBUTE;
-+              d2i_X509_CINF;
-+              d2i_X509_CRL;
-+              d2i_X509_CRL_INFO;
-+              d2i_X509_CRL_bio;
-+              d2i_X509_CRL_fp;
-+              d2i_X509_EXTENSION;
-+              d2i_X509_NAME;
-+              d2i_X509_NAME_ENTRY;
-+              d2i_X509_PKEY;
-+              d2i_X509_PUBKEY;
-+              d2i_X509_REQ;
-+              d2i_X509_REQ_INFO;
-+              d2i_X509_REQ_bio;
-+              d2i_X509_REQ_fp;
-+              d2i_X509_REVOKED;
-+              d2i_X509_SIG;
-+              d2i_X509_VAL;
-+              d2i_X509_bio;
-+              d2i_X509_fp;
-+              DES_cbc_cksum;
-+              DES_cbc_encrypt;
-+              DES_cblock_print_file;
-+              DES_cfb64_encrypt;
-+              DES_cfb_encrypt;
-+              DES_decrypt3;
-+              DES_ecb3_encrypt;
-+              DES_ecb_encrypt;
-+              DES_ede3_cbc_encrypt;
-+              DES_ede3_cfb64_encrypt;
-+              DES_ede3_ofb64_encrypt;
-+              DES_enc_read;
-+              DES_enc_write;
-+              DES_encrypt1;
-+              DES_encrypt2;
-+              DES_encrypt3;
-+              DES_fcrypt;
-+              DES_is_weak_key;
-+              DES_key_sched;
-+              DES_ncbc_encrypt;
-+              DES_ofb64_encrypt;
-+              DES_ofb_encrypt;
-+              DES_options;
-+              DES_pcbc_encrypt;
-+              DES_quad_cksum;
-+              DES_random_key;
-+              _ossl_old_des_random_seed;
-+              _ossl_old_des_read_2passwords;
-+              _ossl_old_des_read_password;
-+              _ossl_old_des_read_pw;
-+              _ossl_old_des_read_pw_string;
-+              DES_set_key;
-+              DES_set_odd_parity;
-+              DES_string_to_2keys;
-+              DES_string_to_key;
-+              DES_xcbc_encrypt;
-+              DES_xwhite_in2out;
-+              fcrypt_body;
-+              i2a_ASN1_INTEGER;
-+              i2a_ASN1_OBJECT;
-+              i2a_ASN1_STRING;
-+              i2d_ASN1_BIT_STRING;
-+              i2d_ASN1_BOOLEAN;
-+              i2d_ASN1_HEADER;
-+              i2d_ASN1_IA5STRING;
-+              i2d_ASN1_INTEGER;
-+              i2d_ASN1_OBJECT;
-+              i2d_ASN1_OCTET_STRING;
-+              i2d_ASN1_PRINTABLE;
-+              i2d_ASN1_SET;
-+              i2d_ASN1_TYPE;
-+              i2d_ASN1_UTCTIME;
-+              i2d_ASN1_bytes;
-+              i2d_DHparams;
-+              i2d_DSAPrivateKey;
-+              i2d_DSAPrivateKey_bio;
-+              i2d_DSAPrivateKey_fp;
-+              i2d_DSAPublicKey;
-+              i2d_DSAparams;
-+              i2d_NETSCAPE_SPKAC;
-+              i2d_NETSCAPE_SPKI;
-+              i2d_Netscape_RSA;
-+              i2d_PKCS7;
-+              i2d_PKCS7_DIGEST;
-+              i2d_PKCS7_ENCRYPT;
-+              i2d_PKCS7_ENC_CONTENT;
-+              i2d_PKCS7_ENVELOPE;
-+              i2d_PKCS7_ISSUER_AND_SERIAL;
-+              i2d_PKCS7_RECIP_INFO;
-+              i2d_PKCS7_SIGNED;
-+              i2d_PKCS7_SIGNER_INFO;
-+              i2d_PKCS7_SIGN_ENVELOPE;
-+              i2d_PKCS7_bio;
-+              i2d_PKCS7_fp;
-+              i2d_PrivateKey;
-+              i2d_PublicKey;
-+              i2d_RSAPrivateKey;
-+              i2d_RSAPrivateKey_bio;
-+              i2d_RSAPrivateKey_fp;
-+              i2d_RSAPublicKey;
-+              i2d_X509;
-+              i2d_X509_ALGOR;
-+              i2d_X509_ATTRIBUTE;
-+              i2d_X509_CINF;
-+              i2d_X509_CRL;
-+              i2d_X509_CRL_INFO;
-+              i2d_X509_CRL_bio;
-+              i2d_X509_CRL_fp;
-+              i2d_X509_EXTENSION;
-+              i2d_X509_NAME;
-+              i2d_X509_NAME_ENTRY;
-+              i2d_X509_PKEY;
-+              i2d_X509_PUBKEY;
-+              i2d_X509_REQ;
-+              i2d_X509_REQ_INFO;
-+              i2d_X509_REQ_bio;
-+              i2d_X509_REQ_fp;
-+              i2d_X509_REVOKED;
-+              i2d_X509_SIG;
-+              i2d_X509_VAL;
-+              i2d_X509_bio;
-+              i2d_X509_fp;
-+              idea_cbc_encrypt;
-+              idea_cfb64_encrypt;
-+              idea_ecb_encrypt;
-+              idea_encrypt;
-+              idea_ofb64_encrypt;
-+              idea_options;
-+              idea_set_decrypt_key;
-+              idea_set_encrypt_key;
-+              lh_delete;
-+              lh_doall;
-+              lh_doall_arg;
-+              lh_free;
-+              lh_insert;
-+              lh_new;
-+              lh_node_stats;
-+              lh_node_stats_bio;
-+              lh_node_usage_stats;
-+              lh_node_usage_stats_bio;
-+              lh_retrieve;
-+              lh_stats;
-+              lh_stats_bio;
-+              lh_strhash;
-+              sk_delete;
-+              sk_delete_ptr;
-+              sk_dup;
-+              sk_find;
-+              sk_free;
-+              sk_insert;
-+              sk_new;
-+              sk_pop;
-+              sk_pop_free;
-+              sk_push;
-+              sk_set_cmp_func;
-+              sk_shift;
-+              sk_unshift;
-+              sk_zero;
-+              BIO_f_nbio_test;
-+              ASN1_TYPE_get;
-+              ASN1_TYPE_set;
-+              PKCS7_content_free;
-+              ERR_load_PKCS7_strings;
-+              X509_find_by_issuer_and_serial;
-+              X509_find_by_subject;
-+              PKCS7_ctrl;
-+              PKCS7_set_type;
-+              PKCS7_set_content;
-+              PKCS7_SIGNER_INFO_set;
-+              PKCS7_add_signer;
-+              PKCS7_add_certificate;
-+              PKCS7_add_crl;
-+              PKCS7_content_new;
-+              PKCS7_dataSign;
-+              PKCS7_dataVerify;
-+              PKCS7_dataInit;
-+              PKCS7_add_signature;
-+              PKCS7_cert_from_signer_info;
-+              PKCS7_get_signer_info;
-+              EVP_delete_alias;
-+              EVP_mdc2;
-+              PEM_read_bio_RSAPublicKey;
-+              PEM_write_bio_RSAPublicKey;
-+              d2i_RSAPublicKey_bio;
-+              i2d_RSAPublicKey_bio;
-+              PEM_read_RSAPublicKey;
-+              PEM_write_RSAPublicKey;
-+              d2i_RSAPublicKey_fp;
-+              i2d_RSAPublicKey_fp;
-+              BIO_copy_next_retry;
-+              RSA_flags;
-+              X509_STORE_add_crl;
-+              X509_load_crl_file;
-+              EVP_rc2_40_cbc;
-+              EVP_rc4_40;
-+              EVP_CIPHER_CTX_init;
-+              HMAC;
-+              HMAC_Init;
-+              HMAC_Update;
-+              HMAC_Final;
-+              ERR_get_next_error_library;
-+              EVP_PKEY_cmp_parameters;
-+              HMAC_cleanup;
-+              BIO_ptr_ctrl;
-+              BIO_new_file_internal;
-+              BIO_new_fp_internal;
-+              BIO_s_file_internal;
-+              BN_BLINDING_convert;
-+              BN_BLINDING_invert;
-+              BN_BLINDING_update;
-+              RSA_blinding_on;
-+              RSA_blinding_off;
-+              i2t_ASN1_OBJECT;
-+              BN_BLINDING_new;
-+              BN_BLINDING_free;
-+              EVP_cast5_cbc;
-+              EVP_cast5_cfb64;
-+              EVP_cast5_ecb;
-+              EVP_cast5_ofb;
-+              BF_decrypt;
-+              CAST_set_key;
-+              CAST_encrypt;
-+              CAST_decrypt;
-+              CAST_ecb_encrypt;
-+              CAST_cbc_encrypt;
-+              CAST_cfb64_encrypt;
-+              CAST_ofb64_encrypt;
-+              RC2_decrypt;
-+              OBJ_create_objects;
-+              BN_exp;
-+              BN_mul_word;
-+              BN_sub_word;
-+              BN_dec2bn;
-+              BN_bn2dec;
-+              BIO_ghbn_ctrl;
-+              CRYPTO_free_ex_data;
-+              CRYPTO_get_ex_data;
-+              CRYPTO_set_ex_data;
-+              ERR_load_CRYPTO_strings;
-+              ERR_load_CRYPTOlib_strings;
-+              EVP_PKEY_bits;
-+              MD5_Transform;
-+              SHA1_Transform;
-+              SHA_Transform;
-+              X509_STORE_CTX_get_chain;
-+              X509_STORE_CTX_get_current_cert;
-+              X509_STORE_CTX_get_error;
-+              X509_STORE_CTX_get_error_depth;
-+              X509_STORE_CTX_get_ex_data;
-+              X509_STORE_CTX_set_cert;
-+              X509_STORE_CTX_set_chain;
-+              X509_STORE_CTX_set_error;
-+              X509_STORE_CTX_set_ex_data;
-+              CRYPTO_dup_ex_data;
-+              CRYPTO_get_new_lockid;
-+              CRYPTO_new_ex_data;
-+              RSA_set_ex_data;
-+              RSA_get_ex_data;
-+              RSA_get_ex_new_index;
-+              RSA_padding_add_PKCS1_type_1;
-+              RSA_padding_add_PKCS1_type_2;
-+              RSA_padding_add_SSLv23;
-+              RSA_padding_add_none;
-+              RSA_padding_check_PKCS1_type_1;
-+              RSA_padding_check_PKCS1_type_2;
-+              RSA_padding_check_SSLv23;
-+              RSA_padding_check_none;
-+              bn_add_words;
-+              d2i_Netscape_RSA_2;
-+              CRYPTO_get_ex_new_index;
-+              RIPEMD160_Init;
-+              RIPEMD160_Update;
-+              RIPEMD160_Final;
-+              RIPEMD160;
-+              RIPEMD160_Transform;
-+              RC5_32_set_key;
-+              RC5_32_ecb_encrypt;
-+              RC5_32_encrypt;
-+              RC5_32_decrypt;
-+              RC5_32_cbc_encrypt;
-+              RC5_32_cfb64_encrypt;
-+              RC5_32_ofb64_encrypt;
-+              BN_bn2mpi;
-+              BN_mpi2bn;
-+              ASN1_BIT_STRING_get_bit;
-+              ASN1_BIT_STRING_set_bit;
-+              BIO_get_ex_data;
-+              BIO_get_ex_new_index;
-+              BIO_set_ex_data;
-+              X509v3_get_key_usage;
-+              X509v3_set_key_usage;
-+              a2i_X509v3_key_usage;
-+              i2a_X509v3_key_usage;
-+              EVP_PKEY_decrypt;
-+              EVP_PKEY_encrypt;
-+              PKCS7_RECIP_INFO_set;
-+              PKCS7_add_recipient;
-+              PKCS7_add_recipient_info;
-+              PKCS7_set_cipher;
-+              ASN1_TYPE_get_int_octetstring;
-+              ASN1_TYPE_get_octetstring;
-+              ASN1_TYPE_set_int_octetstring;
-+              ASN1_TYPE_set_octetstring;
-+              ASN1_UTCTIME_set_string;
-+              ERR_add_error_data;
-+              ERR_set_error_data;
-+              EVP_CIPHER_asn1_to_param;
-+              EVP_CIPHER_param_to_asn1;
-+              EVP_CIPHER_get_asn1_iv;
-+              EVP_CIPHER_set_asn1_iv;
-+              EVP_rc5_32_12_16_cbc;
-+              EVP_rc5_32_12_16_cfb64;
-+              EVP_rc5_32_12_16_ecb;
-+              EVP_rc5_32_12_16_ofb;
-+              asn1_add_error;
-+              d2i_ASN1_BMPSTRING;
-+              i2d_ASN1_BMPSTRING;
-+              BIO_f_ber;
-+              BN_init;
-+              COMP_CTX_new;
-+              COMP_CTX_free;
-+              COMP_CTX_compress_block;
-+              COMP_CTX_expand_block;
-+              X509_STORE_CTX_get_ex_new_index;
-+              OBJ_NAME_add;
-+              BIO_socket_nbio;
-+              EVP_rc2_64_cbc;
-+              OBJ_NAME_cleanup;
-+              OBJ_NAME_get;
-+              OBJ_NAME_init;
-+              OBJ_NAME_new_index;
-+              OBJ_NAME_remove;
-+              BN_MONT_CTX_copy;
-+              BIO_new_socks4a_connect;
-+              BIO_s_socks4a_connect;
-+              PROXY_set_connect_mode;
-+              RAND_SSLeay;
-+              RAND_set_rand_method;
-+              RSA_memory_lock;
-+              bn_sub_words;
-+              bn_mul_normal;
-+              bn_mul_comba8;
-+              bn_mul_comba4;
-+              bn_sqr_normal;
-+              bn_sqr_comba8;
-+              bn_sqr_comba4;
-+              bn_cmp_words;
-+              bn_mul_recursive;
-+              bn_mul_part_recursive;
-+              bn_sqr_recursive;
-+              bn_mul_low_normal;
-+              BN_RECP_CTX_init;
-+              BN_RECP_CTX_new;
-+              BN_RECP_CTX_free;
-+              BN_RECP_CTX_set;
-+              BN_mod_mul_reciprocal;
-+              BN_mod_exp_recp;
-+              BN_div_recp;
-+              BN_CTX_init;
-+              BN_MONT_CTX_init;
-+              RAND_get_rand_method;
-+              PKCS7_add_attribute;
-+              PKCS7_add_signed_attribute;
-+              PKCS7_digest_from_attributes;
-+              PKCS7_get_attribute;
-+              PKCS7_get_issuer_and_serial;
-+              PKCS7_get_signed_attribute;
-+              COMP_compress_block;
-+              COMP_expand_block;
-+              COMP_rle;
-+              COMP_zlib;
-+              ms_time_diff;
-+              ms_time_new;
-+              ms_time_free;
-+              ms_time_cmp;
-+              ms_time_get;
-+              PKCS7_set_attributes;
-+              PKCS7_set_signed_attributes;
-+              X509_ATTRIBUTE_create;
-+              X509_ATTRIBUTE_dup;
-+              ASN1_GENERALIZEDTIME_check;
-+              ASN1_GENERALIZEDTIME_print;
-+              ASN1_GENERALIZEDTIME_set;
-+              ASN1_GENERALIZEDTIME_set_string;
-+              ASN1_TIME_print;
-+              BASIC_CONSTRAINTS_free;
-+              BASIC_CONSTRAINTS_new;
-+              ERR_load_X509V3_strings;
-+              NETSCAPE_CERT_SEQUENCE_free;
-+              NETSCAPE_CERT_SEQUENCE_new;
-+              OBJ_txt2obj;
-+              PEM_read_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_NS_CERT_SEQ;
-+              PEM_read_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_read_bio_NS_CERT_SEQ;
-+              PEM_write_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_NS_CERT_SEQ;
-+              PEM_write_bio_NETSCAPE_CERT_SEQUENCE;
-+              PEM_write_bio_NS_CERT_SEQ;
-+              X509V3_EXT_add;
-+              X509V3_EXT_add_alias;
-+              X509V3_EXT_add_conf;
-+              X509V3_EXT_cleanup;
-+              X509V3_EXT_conf;
-+              X509V3_EXT_conf_nid;
-+              X509V3_EXT_get;
-+              X509V3_EXT_get_nid;
-+              X509V3_EXT_print;
-+              X509V3_EXT_print_fp;
-+              X509V3_add_standard_extensions;
-+              X509V3_add_value;
-+              X509V3_add_value_bool;
-+              X509V3_add_value_int;
-+              X509V3_conf_free;
-+              X509V3_get_value_bool;
-+              X509V3_get_value_int;
-+              X509V3_parse_list;
-+              d2i_ASN1_GENERALIZEDTIME;
-+              d2i_ASN1_TIME;
-+              d2i_BASIC_CONSTRAINTS;
-+              d2i_NETSCAPE_CERT_SEQUENCE;
-+              d2i_ext_ku;
-+              ext_ku_free;
-+              ext_ku_new;
-+              i2d_ASN1_GENERALIZEDTIME;
-+              i2d_ASN1_TIME;
-+              i2d_BASIC_CONSTRAINTS;
-+              i2d_NETSCAPE_CERT_SEQUENCE;
-+              i2d_ext_ku;
-+              EVP_MD_CTX_copy;
-+              i2d_ASN1_ENUMERATED;
-+              d2i_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_set;
-+              ASN1_ENUMERATED_get;
-+              BN_to_ASN1_ENUMERATED;
-+              ASN1_ENUMERATED_to_BN;
-+              i2a_ASN1_ENUMERATED;
-+              a2i_ASN1_ENUMERATED;
-+              i2d_GENERAL_NAME;
-+              d2i_GENERAL_NAME;
-+              GENERAL_NAME_new;
-+              GENERAL_NAME_free;
-+              GENERAL_NAMES_new;
-+              GENERAL_NAMES_free;
-+              d2i_GENERAL_NAMES;
-+              i2d_GENERAL_NAMES;
-+              i2v_GENERAL_NAMES;
-+              i2s_ASN1_OCTET_STRING;
-+              s2i_ASN1_OCTET_STRING;
-+              X509V3_EXT_check_conf;
-+              hex_to_string;
-+              string_to_hex;
-+              DES_ede3_cbcm_encrypt;
-+              RSA_padding_add_PKCS1_OAEP;
-+              RSA_padding_check_PKCS1_OAEP;
-+              X509_CRL_print_fp;
-+              X509_CRL_print;
-+              i2v_GENERAL_NAME;
-+              v2i_GENERAL_NAME;
-+              i2d_PKEY_USAGE_PERIOD;
-+              d2i_PKEY_USAGE_PERIOD;
-+              PKEY_USAGE_PERIOD_new;
-+              PKEY_USAGE_PERIOD_free;
-+              v2i_GENERAL_NAMES;
-+              i2s_ASN1_INTEGER;
-+              X509V3_EXT_d2i;
-+              name_cmp;
-+              str_dup;
-+              i2s_ASN1_ENUMERATED;
-+              i2s_ASN1_ENUMERATED_TABLE;
-+              BIO_s_log;
-+              BIO_f_reliable;
-+              PKCS7_dataFinal;
-+              PKCS7_dataDecode;
-+              X509V3_EXT_CRL_add_conf;
-+              BN_set_params;
-+              BN_get_params;
-+              BIO_get_ex_num;
-+              BIO_set_ex_free_func;
-+              EVP_ripemd160;
-+              ASN1_TIME_set;
-+              i2d_AUTHORITY_KEYID;
-+              d2i_AUTHORITY_KEYID;
-+              AUTHORITY_KEYID_new;
-+              AUTHORITY_KEYID_free;
-+              ASN1_seq_unpack;
-+              ASN1_seq_pack;
-+              ASN1_unpack_string;
-+              ASN1_pack_string;
-+              PKCS12_pack_safebag;
-+              PKCS12_MAKE_KEYBAG;
-+              PKCS8_encrypt;
-+              PKCS12_MAKE_SHKEYBAG;
-+              PKCS12_pack_p7data;
-+              PKCS12_pack_p7encdata;
-+              PKCS12_add_localkeyid;
-+              PKCS12_add_friendlyname_asc;
-+              PKCS12_add_friendlyname_uni;
-+              PKCS12_get_friendlyname;
-+              PKCS12_pbe_crypt;
-+              PKCS12_decrypt_d2i;
-+              PKCS12_i2d_encrypt;
-+              PKCS12_init;
-+              PKCS12_key_gen_asc;
-+              PKCS12_key_gen_uni;
-+              PKCS12_gen_mac;
-+              PKCS12_verify_mac;
-+              PKCS12_set_mac;
-+              PKCS12_setup_mac;
-+              OPENSSL_asc2uni;
-+              OPENSSL_uni2asc;
-+              i2d_PKCS12_BAGS;
-+              PKCS12_BAGS_new;
-+              d2i_PKCS12_BAGS;
-+              PKCS12_BAGS_free;
-+              i2d_PKCS12;
-+              d2i_PKCS12;
-+              PKCS12_new;
-+              PKCS12_free;
-+              i2d_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_new;
-+              d2i_PKCS12_MAC_DATA;
-+              PKCS12_MAC_DATA_free;
-+              i2d_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_new;
-+              d2i_PKCS12_SAFEBAG;
-+              PKCS12_SAFEBAG_free;
-+              ERR_load_PKCS12_strings;
-+              PKCS12_PBE_add;
-+              PKCS8_add_keyusage;
-+              PKCS12_get_attr_gen;
-+              PKCS12_parse;
-+              PKCS12_create;
-+              i2d_PKCS12_bio;
-+              i2d_PKCS12_fp;
-+              d2i_PKCS12_bio;
-+              d2i_PKCS12_fp;
-+              i2d_PBEPARAM;
-+              PBEPARAM_new;
-+              d2i_PBEPARAM;
-+              PBEPARAM_free;
-+              i2d_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_new;
-+              d2i_PKCS8_PRIV_KEY_INFO;
-+              PKCS8_PRIV_KEY_INFO_free;
-+              EVP_PKCS82PKEY;
-+              EVP_PKEY2PKCS8;
-+              PKCS8_set_broken;
-+              EVP_PBE_ALGOR_CipherInit;
-+              EVP_PBE_alg_add;
-+              PKCS5_pbe_set;
-+              EVP_PBE_cleanup;
-+              i2d_SXNET;
-+              d2i_SXNET;
-+              SXNET_new;
-+              SXNET_free;
-+              i2d_SXNETID;
-+              d2i_SXNETID;
-+              SXNETID_new;
-+              SXNETID_free;
-+              DSA_SIG_new;
-+              DSA_SIG_free;
-+              DSA_do_sign;
-+              DSA_do_verify;
-+              d2i_DSA_SIG;
-+              i2d_DSA_SIG;
-+              i2d_ASN1_VISIBLESTRING;
-+              d2i_ASN1_VISIBLESTRING;
-+              i2d_ASN1_UTF8STRING;
-+              d2i_ASN1_UTF8STRING;
-+              i2d_DIRECTORYSTRING;
-+              d2i_DIRECTORYSTRING;
-+              i2d_DISPLAYTEXT;
-+              d2i_DISPLAYTEXT;
-+              d2i_ASN1_SET_OF_X509;
-+              i2d_ASN1_SET_OF_X509;
-+              i2d_PBKDF2PARAM;
-+              PBKDF2PARAM_new;
-+              d2i_PBKDF2PARAM;
-+              PBKDF2PARAM_free;
-+              i2d_PBE2PARAM;
-+              PBE2PARAM_new;
-+              d2i_PBE2PARAM;
-+              PBE2PARAM_free;
-+              d2i_ASN1_SET_OF_GENERAL_NAME;
-+              i2d_ASN1_SET_OF_GENERAL_NAME;
-+              d2i_ASN1_SET_OF_SXNETID;
-+              i2d_ASN1_SET_OF_SXNETID;
-+              d2i_ASN1_SET_OF_POLICYQUALINFO;
-+              i2d_ASN1_SET_OF_POLICYQUALINFO;
-+              d2i_ASN1_SET_OF_POLICYINFO;
-+              i2d_ASN1_SET_OF_POLICYINFO;
-+              SXNET_add_id_asc;
-+              SXNET_add_id_ulong;
-+              SXNET_add_id_INTEGER;
-+              SXNET_get_id_asc;
-+              SXNET_get_id_ulong;
-+              SXNET_get_id_INTEGER;
-+              X509V3_set_conf_lhash;
-+              i2d_CERTIFICATEPOLICIES;
-+              CERTIFICATEPOLICIES_new;
-+              CERTIFICATEPOLICIES_free;
-+              d2i_CERTIFICATEPOLICIES;
-+              i2d_POLICYINFO;
-+              POLICYINFO_new;
-+              d2i_POLICYINFO;
-+              POLICYINFO_free;
-+              i2d_POLICYQUALINFO;
-+              POLICYQUALINFO_new;
-+              d2i_POLICYQUALINFO;
-+              POLICYQUALINFO_free;
-+              i2d_USERNOTICE;
-+              USERNOTICE_new;
-+              d2i_USERNOTICE;
-+              USERNOTICE_free;
-+              i2d_NOTICEREF;
-+              NOTICEREF_new;
-+              d2i_NOTICEREF;
-+              NOTICEREF_free;
-+              X509V3_get_string;
-+              X509V3_get_section;
-+              X509V3_string_free;
-+              X509V3_section_free;
-+              X509V3_set_ctx;
-+              s2i_ASN1_INTEGER;
-+              CRYPTO_set_locked_mem_functions;
-+              CRYPTO_get_locked_mem_functions;
-+              CRYPTO_malloc_locked;
-+              CRYPTO_free_locked;
-+              BN_mod_exp2_mont;
-+              ERR_get_error_line_data;
-+              ERR_peek_error_line_data;
-+              PKCS12_PBE_keyivgen;
-+              X509_ALGOR_dup;
-+              d2i_ASN1_SET_OF_DIST_POINT;
-+              i2d_ASN1_SET_OF_DIST_POINT;
-+              i2d_CRL_DIST_POINTS;
-+              CRL_DIST_POINTS_new;
-+              CRL_DIST_POINTS_free;
-+              d2i_CRL_DIST_POINTS;
-+              i2d_DIST_POINT;
-+              DIST_POINT_new;
-+              d2i_DIST_POINT;
-+              DIST_POINT_free;
-+              i2d_DIST_POINT_NAME;
-+              DIST_POINT_NAME_new;
-+              DIST_POINT_NAME_free;
-+              d2i_DIST_POINT_NAME;
-+              X509V3_add_value_uchar;
-+              d2i_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_ASN1_TYPE;
-+              d2i_ASN1_SET_OF_X509_EXTENSION;
-+              d2i_ASN1_SET_OF_X509_NAME_ENTRY;
-+              d2i_ASN1_SET_OF_ASN1_TYPE;
-+              i2d_ASN1_SET_OF_X509_ATTRIBUTE;
-+              i2d_ASN1_SET_OF_X509_EXTENSION;
-+              i2d_ASN1_SET_OF_X509_NAME_ENTRY;
-+              X509V3_EXT_i2d;
-+              X509V3_EXT_val_prn;
-+              X509V3_EXT_add_list;
-+              EVP_CIPHER_type;
-+              EVP_PBE_CipherInit;
-+              X509V3_add_value_bool_nf;
-+              d2i_ASN1_UINTEGER;
-+              sk_value;
-+              sk_num;
-+              sk_set;
-+              i2d_ASN1_SET_OF_X509_REVOKED;
-+              sk_sort;
-+              d2i_ASN1_SET_OF_X509_REVOKED;
-+              i2d_ASN1_SET_OF_X509_ALGOR;
-+              i2d_ASN1_SET_OF_X509_CRL;
-+              d2i_ASN1_SET_OF_X509_ALGOR;
-+              d2i_ASN1_SET_OF_X509_CRL;
-+              i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              i2d_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO;
-+              d2i_ASN1_SET_OF_PKCS7_RECIP_INFO;
-+              PKCS5_PBE_add;
-+              PEM_write_bio_PKCS8;
-+              i2d_PKCS8_fp;
-+              PEM_read_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_bio_P8_PRIV_KEY_INFO;
-+              d2i_PKCS8_bio;
-+              d2i_PKCS8_PRIV_KEY_INFO_fp;
-+              PEM_write_bio_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_bio_P8_PRIV_KEY_INFO;
-+              PEM_read_PKCS8;
-+              d2i_PKCS8_PRIV_KEY_INFO_bio;
-+              d2i_PKCS8_fp;
-+              PEM_write_PKCS8;
-+              PEM_read_PKCS8_PRIV_KEY_INFO;
-+              PEM_read_P8_PRIV_KEY_INFO;
-+              PEM_read_bio_PKCS8;
-+              PEM_write_PKCS8_PRIV_KEY_INFO;
-+              PEM_write_P8_PRIV_KEY_INFO;
-+              PKCS5_PBE_keyivgen;
-+              i2d_PKCS8_bio;
-+              i2d_PKCS8_PRIV_KEY_INFO_fp;
-+              i2d_PKCS8_PRIV_KEY_INFO_bio;
-+              BIO_s_bio;
-+              PKCS5_pbe2_set;
-+              PKCS5_PBKDF2_HMAC_SHA1;
-+              PKCS5_v2_PBE_keyivgen;
-+              PEM_write_bio_PKCS8PrivateKey;
-+              PEM_write_PKCS8PrivateKey;
-+              BIO_ctrl_get_read_request;
-+              BIO_ctrl_pending;
-+              BIO_ctrl_wpending;
-+              BIO_new_bio_pair;
-+              BIO_ctrl_get_write_guarantee;
-+              CRYPTO_num_locks;
-+              CONF_load_bio;
-+              CONF_load_fp;
-+              i2d_ASN1_SET_OF_ASN1_OBJECT;
-+              d2i_ASN1_SET_OF_ASN1_OBJECT;
-+              PKCS7_signatureVerify;
-+              RSA_set_method;
-+              RSA_get_method;
-+              RSA_get_default_method;
-+              RSA_check_key;
-+              OBJ_obj2txt;
-+              DSA_dup_DH;
-+              X509_REQ_get_extensions;
-+              X509_REQ_set_extension_nids;
-+              BIO_nwrite;
-+              X509_REQ_extension_nid;
-+              BIO_nread;
-+              X509_REQ_get_extension_nids;
-+              BIO_nwrite0;
-+              X509_REQ_add_extensions_nid;
-+              BIO_nread0;
-+              X509_REQ_add_extensions;
-+              BIO_new_mem_buf;
-+              DH_set_ex_data;
-+              DH_set_method;
-+              DSA_OpenSSL;
-+              DH_get_ex_data;
-+              DH_get_ex_new_index;
-+              DSA_new_method;
-+              DH_new_method;
-+              DH_OpenSSL;
-+              DSA_get_ex_new_index;
-+              DH_get_default_method;
-+              DSA_set_ex_data;
-+              DH_set_default_method;
-+              DSA_get_ex_data;
-+              X509V3_EXT_REQ_add_conf;
-+              NETSCAPE_SPKI_print;
-+              NETSCAPE_SPKI_set_pubkey;
-+              NETSCAPE_SPKI_b64_encode;
-+              NETSCAPE_SPKI_get_pubkey;
-+              NETSCAPE_SPKI_b64_decode;
-+              UTF8_putc;
-+              UTF8_getc;
-+              RSA_null_method;
-+              ASN1_tag2str;
-+              BIO_ctrl_reset_read_request;
-+              DISPLAYTEXT_new;
-+              ASN1_GENERALIZEDTIME_free;
-+              X509_REVOKED_get_ext_d2i;
-+              X509_set_ex_data;
-+              X509_reject_set_bit_asc;
-+              X509_NAME_add_entry_by_txt;
-+              X509_NAME_add_entry_by_NID;
-+              X509_PURPOSE_get0;
-+              PEM_read_X509_AUX;
-+              d2i_AUTHORITY_INFO_ACCESS;
-+              PEM_write_PUBKEY;
-+              ACCESS_DESCRIPTION_new;
-+              X509_CERT_AUX_free;
-+              d2i_ACCESS_DESCRIPTION;
-+              X509_trust_clear;
-+              X509_TRUST_add;
-+              ASN1_VISIBLESTRING_new;
-+              X509_alias_set1;
-+              ASN1_PRINTABLESTRING_free;
-+              EVP_PKEY_get1_DSA;
-+              ASN1_BMPSTRING_new;
-+              ASN1_mbstring_copy;
-+              ASN1_UTF8STRING_new;
-+              DSA_get_default_method;
-+              i2d_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_T61STRING_free;
-+              DSA_set_method;
-+              X509_get_ex_data;
-+              ASN1_STRING_type;
-+              X509_PURPOSE_get_by_sname;
-+              ASN1_TIME_free;
-+              ASN1_OCTET_STRING_cmp;
-+              ASN1_BIT_STRING_new;
-+              X509_get_ext_d2i;
-+              PEM_read_bio_X509_AUX;
-+              ASN1_STRING_set_default_mask_asc;
-+              ASN1_STRING_set_def_mask_asc;
-+              PEM_write_bio_RSA_PUBKEY;
-+              ASN1_INTEGER_cmp;
-+              d2i_RSA_PUBKEY_fp;
-+              X509_trust_set_bit_asc;
-+              PEM_write_bio_DSA_PUBKEY;
-+              X509_STORE_CTX_free;
-+              EVP_PKEY_set1_DSA;
-+              i2d_DSA_PUBKEY_fp;
-+              X509_load_cert_crl_file;
-+              ASN1_TIME_new;
-+              i2d_RSA_PUBKEY;
-+              X509_STORE_CTX_purpose_inherit;
-+              PEM_read_RSA_PUBKEY;
-+              d2i_X509_AUX;
-+              i2d_DSA_PUBKEY;
-+              X509_CERT_AUX_print;
-+              PEM_read_DSA_PUBKEY;
-+              i2d_RSA_PUBKEY_bio;
-+              ASN1_BIT_STRING_num_asc;
-+              i2d_PUBKEY;
-+              ASN1_UTCTIME_free;
-+              DSA_set_default_method;
-+              X509_PURPOSE_get_by_id;
-+              ACCESS_DESCRIPTION_free;
-+              PEM_read_bio_PUBKEY;
-+              ASN1_STRING_set_by_NID;
-+              X509_PURPOSE_get_id;
-+              DISPLAYTEXT_free;
-+              OTHERNAME_new;
-+              X509_CERT_AUX_new;
-+              X509_TRUST_cleanup;
-+              X509_NAME_add_entry_by_OBJ;
-+              X509_CRL_get_ext_d2i;
-+              X509_PURPOSE_get0_name;
-+              PEM_read_PUBKEY;
-+              i2d_DSA_PUBKEY_bio;
-+              i2d_OTHERNAME;
-+              ASN1_OCTET_STRING_free;
-+              ASN1_BIT_STRING_set_asc;
-+              X509_get_ex_new_index;
-+              ASN1_STRING_TABLE_cleanup;
-+              X509_TRUST_get_by_id;
-+              X509_PURPOSE_get_trust;
-+              ASN1_STRING_length;
-+              d2i_ASN1_SET_OF_ACCESS_DESCRIPTION;
-+              ASN1_PRINTABLESTRING_new;
-+              X509V3_get_d2i;
-+              ASN1_ENUMERATED_free;
-+              i2d_X509_CERT_AUX;
-+              X509_STORE_CTX_set_trust;
-+              ASN1_STRING_set_default_mask;
-+              X509_STORE_CTX_new;
-+              EVP_PKEY_get1_RSA;
-+              DIRECTORYSTRING_free;
-+              PEM_write_X509_AUX;
-+              ASN1_OCTET_STRING_set;
-+              d2i_DSA_PUBKEY_fp;
-+              d2i_RSA_PUBKEY;
-+              X509_TRUST_get0_name;
-+              X509_TRUST_get0;
-+              AUTHORITY_INFO_ACCESS_free;
-+              ASN1_IA5STRING_new;
-+              d2i_DSA_PUBKEY;
-+              X509_check_purpose;
-+              ASN1_ENUMERATED_new;
-+              d2i_RSA_PUBKEY_bio;
-+              d2i_PUBKEY;
-+              X509_TRUST_get_trust;
-+              X509_TRUST_get_flags;
-+              ASN1_BMPSTRING_free;
-+              ASN1_T61STRING_new;
-+              ASN1_UTCTIME_new;
-+              i2d_AUTHORITY_INFO_ACCESS;
-+              EVP_PKEY_set1_RSA;
-+              X509_STORE_CTX_set_purpose;
-+              ASN1_IA5STRING_free;
-+              PEM_write_bio_X509_AUX;
-+              X509_PURPOSE_get_count;
-+              CRYPTO_add_info;
-+              X509_NAME_ENTRY_create_by_txt;
-+              ASN1_STRING_get_default_mask;
-+              X509_alias_get0;
-+              ASN1_STRING_data;
-+              i2d_ACCESS_DESCRIPTION;
-+              X509_trust_set_bit;
-+              ASN1_BIT_STRING_free;
-+              PEM_read_bio_RSA_PUBKEY;
-+              X509_add1_reject_object;
-+              X509_check_trust;
-+              PEM_read_bio_DSA_PUBKEY;
-+              X509_PURPOSE_add;
-+              ASN1_STRING_TABLE_get;
-+              ASN1_UTF8STRING_free;
-+              d2i_DSA_PUBKEY_bio;
-+              PEM_write_RSA_PUBKEY;
-+              d2i_OTHERNAME;
-+              X509_reject_set_bit;
-+              PEM_write_DSA_PUBKEY;
-+              X509_PURPOSE_get0_sname;
-+              EVP_PKEY_set1_DH;
-+              ASN1_OCTET_STRING_dup;
-+              ASN1_BIT_STRING_set;
-+              X509_TRUST_get_count;
-+              ASN1_INTEGER_free;
-+              OTHERNAME_free;
-+              i2d_RSA_PUBKEY_fp;
-+              ASN1_INTEGER_dup;
-+              d2i_X509_CERT_AUX;
-+              PEM_write_bio_PUBKEY;
-+              ASN1_VISIBLESTRING_free;
-+              X509_PURPOSE_cleanup;
-+              ASN1_mbstring_ncopy;
-+              ASN1_GENERALIZEDTIME_new;
-+              EVP_PKEY_get1_DH;
-+              ASN1_OCTET_STRING_new;
-+              ASN1_INTEGER_new;
-+              i2d_X509_AUX;
-+              ASN1_BIT_STRING_name_print;
-+              X509_cmp;
-+              ASN1_STRING_length_set;
-+              DIRECTORYSTRING_new;
-+              X509_add1_trust_object;
-+              PKCS12_newpass;
-+              SMIME_write_PKCS7;
-+              SMIME_read_PKCS7;
-+              DES_set_key_checked;
-+              PKCS7_verify;
-+              PKCS7_encrypt;
-+              DES_set_key_unchecked;
-+              SMIME_crlf_copy;
-+              i2d_ASN1_PRINTABLESTRING;
-+              PKCS7_get0_signers;
-+              PKCS7_decrypt;
-+              SMIME_text;
-+              PKCS7_simple_smimecap;
-+              PKCS7_get_smimecap;
-+              PKCS7_sign;
-+              PKCS7_add_attrib_smimecap;
-+              CRYPTO_dbg_set_options;
-+              CRYPTO_remove_all_info;
-+              CRYPTO_get_mem_debug_functions;
-+              CRYPTO_is_mem_check_on;
-+              CRYPTO_set_mem_debug_functions;
-+              CRYPTO_pop_info;
-+              CRYPTO_push_info_;
-+              CRYPTO_set_mem_debug_options;
-+              PEM_write_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivateKey_nid;
-+              PEM_write_bio_PKCS8PrivKey_nid;
-+              d2i_PKCS8PrivateKey_bio;
-+              ASN1_NULL_free;
-+              d2i_ASN1_NULL;
-+              ASN1_NULL_new;
-+              i2d_PKCS8PrivateKey_bio;
-+              i2d_PKCS8PrivateKey_fp;
-+              i2d_ASN1_NULL;
-+              i2d_PKCS8PrivateKey_nid_fp;
-+              d2i_PKCS8PrivateKey_fp;
-+              i2d_PKCS8PrivateKey_nid_bio;
-+              i2d_PKCS8PrivateKeyInfo_fp;
-+              i2d_PKCS8PrivateKeyInfo_bio;
-+              PEM_cb;
-+              i2d_PrivateKey_fp;
-+              d2i_PrivateKey_bio;
-+              d2i_PrivateKey_fp;
-+              i2d_PrivateKey_bio;
-+              X509_reject_clear;
-+              X509_TRUST_set_default;
-+              d2i_AutoPrivateKey;
-+              X509_ATTRIBUTE_get0_type;
-+              X509_ATTRIBUTE_set1_data;
-+              X509at_get_attr;
-+              X509at_get_attr_count;
-+              X509_ATTRIBUTE_create_by_NID;
-+              X509_ATTRIBUTE_set1_object;
-+              X509_ATTRIBUTE_count;
-+              X509_ATTRIBUTE_create_by_OBJ;
-+              X509_ATTRIBUTE_get0_object;
-+              X509at_get_attr_by_NID;
-+              X509at_add1_attr;
-+              X509_ATTRIBUTE_get0_data;
-+              X509at_delete_attr;
-+              X509at_get_attr_by_OBJ;
-+              RAND_add;
-+              BIO_number_written;
-+              BIO_number_read;
-+              X509_STORE_CTX_get1_chain;
-+              ERR_load_RAND_strings;
-+              RAND_pseudo_bytes;
-+              X509_REQ_get_attr_by_NID;
-+              X509_REQ_get_attr;
-+              X509_REQ_add1_attr_by_NID;
-+              X509_REQ_get_attr_by_OBJ;
-+              X509at_add1_attr_by_NID;
-+              X509_REQ_add1_attr_by_OBJ;
-+              X509_REQ_get_attr_count;
-+              X509_REQ_add1_attr;
-+              X509_REQ_delete_attr;
-+              X509at_add1_attr_by_OBJ;
-+              X509_REQ_add1_attr_by_txt;
-+              X509_ATTRIBUTE_create_by_txt;
-+              X509at_add1_attr_by_txt;
-+              BN_pseudo_rand;
-+              BN_is_prime_fasttest;
-+              BN_CTX_end;
-+              BN_CTX_start;
-+              BN_CTX_get;
-+              EVP_PKEY2PKCS8_broken;
-+              ASN1_STRING_TABLE_add;
-+              CRYPTO_dbg_get_options;
-+              AUTHORITY_INFO_ACCESS_new;
-+              CRYPTO_get_mem_debug_options;
-+              DES_crypt;
-+              PEM_write_bio_X509_REQ_NEW;
-+              PEM_write_X509_REQ_NEW;
-+              BIO_callback_ctrl;
-+              RAND_egd;
-+              RAND_status;
-+              bn_dump1;
-+              DES_check_key_parity;
-+              lh_num_items;
-+              RAND_event;
-+              DSO_new;
-+              DSO_new_method;
-+              DSO_free;
-+              DSO_flags;
-+              DSO_up;
-+              DSO_set_default_method;
-+              DSO_get_default_method;
-+              DSO_get_method;
-+              DSO_set_method;
-+              DSO_load;
-+              DSO_bind_var;
-+              DSO_METHOD_null;
-+              DSO_METHOD_openssl;
-+              DSO_METHOD_dlfcn;
-+              DSO_METHOD_win32;
-+              ERR_load_DSO_strings;
-+              DSO_METHOD_dl;
-+              NCONF_load;
-+              NCONF_load_fp;
-+              NCONF_new;
-+              NCONF_get_string;
-+              NCONF_free;
-+              NCONF_get_number;
-+              CONF_dump_fp;
-+              NCONF_load_bio;
-+              NCONF_dump_fp;
-+              NCONF_get_section;
-+              NCONF_dump_bio;
-+              CONF_dump_bio;
-+              NCONF_free_data;
-+              CONF_set_default_method;
-+              ERR_error_string_n;
-+              BIO_snprintf;
-+              DSO_ctrl;
-+              i2d_ASN1_SET_OF_ASN1_INTEGER;
-+              i2d_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              i2d_ASN1_SET_OF_PKCS7;
-+              BIO_vfree;
-+              d2i_ASN1_SET_OF_ASN1_INTEGER;
-+              d2i_ASN1_SET_OF_PKCS12_SAFEBAG;
-+              ASN1_UTCTIME_get;
-+              X509_REQ_digest;
-+              X509_CRL_digest;
-+              d2i_ASN1_SET_OF_PKCS7;
-+              EVP_CIPHER_CTX_set_key_length;
-+              EVP_CIPHER_CTX_ctrl;
-+              BN_mod_exp_mont_word;
-+              RAND_egd_bytes;
-+              X509_REQ_get1_email;
-+              X509_get1_email;
-+              X509_email_free;
-+              i2d_RSA_NET;
-+              d2i_RSA_NET_2;
-+              d2i_RSA_NET;
-+              DSO_bind_func;
-+              CRYPTO_get_new_dynlockid;
-+              sk_new_null;
-+              CRYPTO_set_dynlock_destroy_callback;
-+              CRYPTO_set_dynlock_destroy_cb;
-+              CRYPTO_destroy_dynlockid;
-+              CRYPTO_set_dynlock_size;
-+              CRYPTO_set_dynlock_create_callback;
-+              CRYPTO_set_dynlock_create_cb;
-+              CRYPTO_set_dynlock_lock_callback;
-+              CRYPTO_set_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_lock_callback;
-+              CRYPTO_get_dynlock_lock_cb;
-+              CRYPTO_get_dynlock_destroy_callback;
-+              CRYPTO_get_dynlock_destroy_cb;
-+              CRYPTO_get_dynlock_value;
-+              CRYPTO_get_dynlock_create_callback;
-+              CRYPTO_get_dynlock_create_cb;
-+              c2i_ASN1_BIT_STRING;
-+              i2c_ASN1_BIT_STRING;
-+              RAND_poll;
-+              c2i_ASN1_INTEGER;
-+              i2c_ASN1_INTEGER;
-+              BIO_dump_indent;
-+              ASN1_parse_dump;
-+              c2i_ASN1_OBJECT;
-+              X509_NAME_print_ex_fp;
-+              ASN1_STRING_print_ex_fp;
-+              X509_NAME_print_ex;
-+              ASN1_STRING_print_ex;
-+              MD4;
-+              MD4_Transform;
-+              MD4_Final;
-+              MD4_Update;
-+              MD4_Init;
-+              EVP_md4;
-+              i2d_PUBKEY_bio;
-+              i2d_PUBKEY_fp;
-+              d2i_PUBKEY_bio;
-+              ASN1_STRING_to_UTF8;
-+              BIO_vprintf;
-+              BIO_vsnprintf;
-+              d2i_PUBKEY_fp;
-+              X509_cmp_time;
-+              X509_STORE_CTX_set_time;
-+              X509_STORE_CTX_get1_issuer;
-+              X509_OBJECT_retrieve_match;
-+              X509_OBJECT_idx_by_subject;
-+              X509_STORE_CTX_set_flags;
-+              X509_STORE_CTX_trusted_stack;
-+              X509_time_adj;
-+              X509_check_issued;
-+              ASN1_UTCTIME_cmp_time_t;
-+              DES_set_weak_key_flag;
-+              DES_check_key;
-+              DES_rw_mode;
-+              RSA_PKCS1_RSAref;
-+              X509_keyid_set1;
-+              BIO_next;
-+              DSO_METHOD_vms;
-+              BIO_f_linebuffer;
-+              BN_bntest_rand;
-+              OPENSSL_issetugid;
-+              BN_rand_range;
-+              ERR_load_ENGINE_strings;
-+              ENGINE_set_DSA;
-+              ENGINE_get_finish_function;
-+              ENGINE_get_default_RSA;
-+              ENGINE_get_BN_mod_exp;
-+              DSA_get_default_openssl_method;
-+              ENGINE_set_DH;
-+              ENGINE_set_def_BN_mod_exp_crt;
-+              ENGINE_set_default_BN_mod_exp_crt;
-+              ENGINE_init;
-+              DH_get_default_openssl_method;
-+              RSA_set_default_openssl_method;
-+              ENGINE_finish;
-+              ENGINE_load_public_key;
-+              ENGINE_get_DH;
-+              ENGINE_ctrl;
-+              ENGINE_get_init_function;
-+              ENGINE_set_init_function;
-+              ENGINE_set_default_DSA;
-+              ENGINE_get_name;
-+              ENGINE_get_last;
-+              ENGINE_get_prev;
-+              ENGINE_get_default_DH;
-+              ENGINE_get_RSA;
-+              ENGINE_set_default;
-+              ENGINE_get_RAND;
-+              ENGINE_get_first;
-+              ENGINE_by_id;
-+              ENGINE_set_finish_function;
-+              ENGINE_get_def_BN_mod_exp_crt;
-+              ENGINE_get_default_BN_mod_exp_crt;
-+              RSA_get_default_openssl_method;
-+              ENGINE_set_RSA;
-+              ENGINE_load_private_key;
-+              ENGINE_set_default_RAND;
-+              ENGINE_set_BN_mod_exp;
-+              ENGINE_remove;
-+              ENGINE_free;
-+              ENGINE_get_BN_mod_exp_crt;
-+              ENGINE_get_next;
-+              ENGINE_set_name;
-+              ENGINE_get_default_DSA;
-+              ENGINE_set_default_BN_mod_exp;
-+              ENGINE_set_default_RSA;
-+              ENGINE_get_default_RAND;
-+              ENGINE_get_default_BN_mod_exp;
-+              ENGINE_set_RAND;
-+              ENGINE_set_id;
-+              ENGINE_set_BN_mod_exp_crt;
-+              ENGINE_set_default_DH;
-+              ENGINE_new;
-+              ENGINE_get_id;
-+              DSA_set_default_openssl_method;
-+              ENGINE_add;
-+              DH_set_default_openssl_method;
-+              ENGINE_get_DSA;
-+              ENGINE_get_ctrl_function;
-+              ENGINE_set_ctrl_function;
-+              BN_pseudo_rand_range;
-+              X509_STORE_CTX_set_verify_cb;
-+              ERR_load_COMP_strings;
-+              PKCS12_item_decrypt_d2i;
-+              ASN1_UTF8STRING_it;
-+              ENGINE_unregister_ciphers;
-+              ENGINE_get_ciphers;
-+              d2i_OCSP_BASICRESP;
-+              KRB5_CHECKSUM_it;
-+              EC_POINT_add;
-+              ASN1_item_ex_i2d;
-+              OCSP_CERTID_it;
-+              d2i_OCSP_RESPBYTES;
-+              X509V3_add1_i2d;
-+              PKCS7_ENVELOPE_it;
-+              UI_add_input_boolean;
-+              ENGINE_unregister_RSA;
-+              X509V3_EXT_nconf;
-+              ASN1_GENERALSTRING_free;
-+              d2i_OCSP_CERTSTATUS;
-+              X509_REVOKED_set_serialNumber;
-+              X509_print_ex;
-+              OCSP_ONEREQ_get1_ext_d2i;
-+              ENGINE_register_all_RAND;
-+              ENGINE_load_dynamic;
-+              PBKDF2PARAM_it;
-+              EXTENDED_KEY_USAGE_new;
-+              EC_GROUP_clear_free;
-+              OCSP_sendreq_bio;
-+              ASN1_item_digest;
-+              OCSP_BASICRESP_delete_ext;
-+              OCSP_SIGNATURE_it;
-+              X509_CRL_it;
-+              OCSP_BASICRESP_add_ext;
-+              KRB5_ENCKEY_it;
-+              UI_method_set_closer;
-+              X509_STORE_set_purpose;
-+              i2d_ASN1_GENERALSTRING;
-+              OCSP_response_status;
-+              i2d_OCSP_SERVICELOC;
-+              ENGINE_get_digest_engine;
-+              EC_GROUP_set_curve_GFp;
-+              OCSP_REQUEST_get_ext_by_OBJ;
-+              _ossl_old_des_random_key;
-+              ASN1_T61STRING_it;
-+              EC_GROUP_method_of;
-+              i2d_KRB5_APREQ;
-+              _ossl_old_des_encrypt;
-+              ASN1_PRINTABLE_new;
-+              HMAC_Init_ex;
-+              d2i_KRB5_AUTHENT;
-+              OCSP_archive_cutoff_new;
-+              EC_POINT_set_Jprojective_coordinates_GFp;
-+              EC_POINT_set_Jproj_coords_GFp;
-+              _ossl_old_des_is_weak_key;
-+              OCSP_BASICRESP_get_ext_by_OBJ;
-+              EC_POINT_oct2point;
-+              OCSP_SINGLERESP_get_ext_count;
-+              UI_ctrl;
-+              _shadow_DES_rw_mode;
-+              asn1_do_adb;
-+              ASN1_template_i2d;
-+              ENGINE_register_DH;
-+              UI_construct_prompt;
-+              X509_STORE_set_trust;
-+              UI_dup_input_string;
-+              d2i_KRB5_APREQ;
-+              EVP_MD_CTX_copy_ex;
-+              OCSP_request_is_signed;
-+              i2d_OCSP_REQINFO;
-+              KRB5_ENCKEY_free;
-+              OCSP_resp_get0;
-+              GENERAL_NAME_it;
-+              ASN1_GENERALIZEDTIME_it;
-+              X509_STORE_set_flags;
-+              EC_POINT_set_compressed_coordinates_GFp;
-+              EC_POINT_set_compr_coords_GFp;
-+              OCSP_response_status_str;
-+              d2i_OCSP_REVOKEDINFO;
-+              OCSP_basic_add1_cert;
-+              ERR_get_implementation;
-+              EVP_CipherFinal_ex;
-+              OCSP_CERTSTATUS_new;
-+              CRYPTO_cleanup_all_ex_data;
-+              OCSP_resp_find;
-+              BN_nnmod;
-+              X509_CRL_sort;
-+              X509_REVOKED_set_revocationDate;
-+              ENGINE_register_RAND;
-+              OCSP_SERVICELOC_new;
-+              EC_POINT_set_affine_coordinates_GFp;
-+              EC_POINT_set_affine_coords_GFp;
-+              _ossl_old_des_options;
-+              SXNET_it;
-+              UI_dup_input_boolean;
-+              PKCS12_add_CSPName_asc;
-+              EC_POINT_is_at_infinity;
-+              ENGINE_load_cryptodev;
-+              DSO_convert_filename;
-+              POLICYQUALINFO_it;
-+              ENGINE_register_ciphers;
-+              BN_mod_lshift_quick;
-+              DSO_set_filename;
-+              ASN1_item_free;
-+              KRB5_TKTBODY_free;
-+              AUTHORITY_KEYID_it;
-+              KRB5_APREQBODY_new;
-+              X509V3_EXT_REQ_add_nconf;
-+              ENGINE_ctrl_cmd_string;
-+              i2d_OCSP_RESPDATA;
-+              EVP_MD_CTX_init;
-+              EXTENDED_KEY_USAGE_free;
-+              PKCS7_ATTR_SIGN_it;
-+              UI_add_error_string;
-+              KRB5_CHECKSUM_free;
-+              OCSP_REQUEST_get_ext;
-+              ENGINE_load_ubsec;
-+              ENGINE_register_all_digests;
-+              PKEY_USAGE_PERIOD_it;
-+              PKCS12_unpack_authsafes;
-+              ASN1_item_unpack;
-+              NETSCAPE_SPKAC_it;
-+              X509_REVOKED_it;
-+              ASN1_STRING_encode;
-+              EVP_aes_128_ecb;
-+              KRB5_AUTHENT_free;
-+              OCSP_BASICRESP_get_ext_by_critical;
-+              OCSP_BASICRESP_get_ext_by_crit;
-+              OCSP_cert_status_str;
-+              d2i_OCSP_REQUEST;
-+              UI_dup_info_string;
-+              _ossl_old_des_xwhite_in2out;
-+              PKCS12_it;
-+              OCSP_SINGLERESP_get_ext_by_critical;
-+              OCSP_SINGLERESP_get_ext_by_crit;
-+              OCSP_CERTSTATUS_free;
-+              _ossl_old_des_crypt;
-+              ASN1_item_i2d;
-+              EVP_DecryptFinal_ex;
-+              ENGINE_load_openssl;
-+              ENGINE_get_cmd_defns;
-+              ENGINE_set_load_privkey_function;
-+              ENGINE_set_load_privkey_fn;
-+              EVP_EncryptFinal_ex;
-+              ENGINE_set_default_digests;
-+              X509_get0_pubkey_bitstr;
-+              asn1_ex_i2c;
-+              ENGINE_register_RSA;
-+              ENGINE_unregister_DSA;
-+              _ossl_old_des_key_sched;
-+              X509_EXTENSION_it;
-+              i2d_KRB5_AUTHENT;
-+              SXNETID_it;
-+              d2i_OCSP_SINGLERESP;
-+              EDIPARTYNAME_new;
-+              PKCS12_certbag2x509;
-+              _ossl_old_des_ofb64_encrypt;
-+              d2i_EXTENDED_KEY_USAGE;
-+              ERR_print_errors_cb;
-+              ENGINE_set_ciphers;
-+              d2i_KRB5_APREQBODY;
-+              UI_method_get_flusher;
-+              X509_PUBKEY_it;
-+              _ossl_old_des_enc_read;
-+              PKCS7_ENCRYPT_it;
-+              i2d_OCSP_RESPONSE;
-+              EC_GROUP_get_cofactor;
-+              PKCS12_unpack_p7data;
-+              d2i_KRB5_AUTHDATA;
-+              OCSP_copy_nonce;
-+              KRB5_AUTHDATA_new;
-+              OCSP_RESPDATA_new;
-+              EC_GFp_mont_method;
-+              OCSP_REVOKEDINFO_free;
-+              UI_get_ex_data;
-+              KRB5_APREQBODY_free;
-+              EC_GROUP_get0_generator;
-+              UI_get_default_method;
-+              X509V3_set_nconf;
-+              PKCS12_item_i2d_encrypt;
-+              X509_add1_ext_i2d;
-+              PKCS7_SIGNER_INFO_it;
-+              KRB5_PRINCNAME_new;
-+              PKCS12_SAFEBAG_it;
-+              EC_GROUP_get_order;
-+              d2i_OCSP_RESPID;
-+              OCSP_request_verify;
-+              NCONF_get_number_e;
-+              _ossl_old_des_decrypt3;
-+              X509_signature_print;
-+              OCSP_SINGLERESP_free;
-+              ENGINE_load_builtin_engines;
-+              i2d_OCSP_ONEREQ;
-+              OCSP_REQUEST_add_ext;
-+              OCSP_RESPBYTES_new;
-+              EVP_MD_CTX_create;
-+              OCSP_resp_find_status;
-+              X509_ALGOR_it;
-+              ASN1_TIME_it;
-+              OCSP_request_set1_name;
-+              OCSP_ONEREQ_get_ext_count;
-+              UI_get0_result;
-+              PKCS12_AUTHSAFES_it;
-+              EVP_aes_256_ecb;
-+              PKCS12_pack_authsafes;
-+              ASN1_IA5STRING_it;
-+              UI_get_input_flags;
-+              EC_GROUP_set_generator;
-+              _ossl_old_des_string_to_2keys;
-+              OCSP_CERTID_free;
-+              X509_CERT_AUX_it;
-+              CERTIFICATEPOLICIES_it;
-+              _ossl_old_des_ede3_cbc_encrypt;
-+              RAND_set_rand_engine;
-+              DSO_get_loaded_filename;
-+              X509_ATTRIBUTE_it;
-+              OCSP_ONEREQ_get_ext_by_NID;
-+              PKCS12_decrypt_skey;
-+              KRB5_AUTHENT_it;
-+              UI_dup_error_string;
-+              RSAPublicKey_it;
-+              i2d_OCSP_REQUEST;
-+              PKCS12_x509crl2certbag;
-+              OCSP_SERVICELOC_it;
-+              ASN1_item_sign;
-+              X509_CRL_set_issuer_name;
-+              OBJ_NAME_do_all_sorted;
-+              i2d_OCSP_BASICRESP;
-+              i2d_OCSP_RESPBYTES;
-+              PKCS12_unpack_p7encdata;
-+              HMAC_CTX_init;
-+              ENGINE_get_digest;
-+              OCSP_RESPONSE_print;
-+              KRB5_TKTBODY_it;
-+              ACCESS_DESCRIPTION_it;
-+              PKCS7_ISSUER_AND_SERIAL_it;
-+              PBE2PARAM_it;
-+              PKCS12_certbag2x509crl;
-+              PKCS7_SIGNED_it;
-+              ENGINE_get_cipher;
-+              i2d_OCSP_CRLID;
-+              OCSP_SINGLERESP_new;
-+              ENGINE_cmd_is_executable;
-+              RSA_up_ref;
-+              ASN1_GENERALSTRING_it;
-+              ENGINE_register_DSA;
-+              X509V3_EXT_add_nconf_sk;
-+              ENGINE_set_load_pubkey_function;
-+              PKCS8_decrypt;
-+              PEM_bytes_read_bio;
-+              DIRECTORYSTRING_it;
-+              d2i_OCSP_CRLID;
-+              EC_POINT_is_on_curve;
-+              CRYPTO_set_locked_mem_ex_functions;
-+              CRYPTO_set_locked_mem_ex_funcs;
-+              d2i_KRB5_CHECKSUM;
-+              ASN1_item_dup;
-+              X509_it;
-+              BN_mod_add;
-+              KRB5_AUTHDATA_free;
-+              _ossl_old_des_cbc_cksum;
-+              ASN1_item_verify;
-+              CRYPTO_set_mem_ex_functions;
-+              EC_POINT_get_Jprojective_coordinates_GFp;
-+              EC_POINT_get_Jproj_coords_GFp;
-+              ZLONG_it;
-+              CRYPTO_get_locked_mem_ex_functions;
-+              CRYPTO_get_locked_mem_ex_funcs;
-+              ASN1_TIME_check;
-+              UI_get0_user_data;
-+              HMAC_CTX_cleanup;
-+              DSA_up_ref;
-+              _ossl_old_des_ede3_cfb64_encrypt;
-+              _ossl_odes_ede3_cfb64_encrypt;
-+              ASN1_BMPSTRING_it;
-+              ASN1_tag2bit;
-+              UI_method_set_flusher;
-+              X509_ocspid_print;
-+              KRB5_ENCDATA_it;
-+              ENGINE_get_load_pubkey_function;
-+              UI_add_user_data;
-+              OCSP_REQUEST_delete_ext;
-+              UI_get_method;
-+              OCSP_ONEREQ_free;
-+              ASN1_PRINTABLESTRING_it;
-+              X509_CRL_set_nextUpdate;
-+              OCSP_REQUEST_it;
-+              OCSP_BASICRESP_it;
-+              AES_ecb_encrypt;
-+              BN_mod_sqr;
-+              NETSCAPE_CERT_SEQUENCE_it;
-+              GENERAL_NAMES_it;
-+              AUTHORITY_INFO_ACCESS_it;
-+              ASN1_FBOOLEAN_it;
-+              UI_set_ex_data;
-+              _ossl_old_des_string_to_key;
-+              ENGINE_register_all_RSA;
-+              d2i_KRB5_PRINCNAME;
-+              OCSP_RESPBYTES_it;
-+              X509_CINF_it;
-+              ENGINE_unregister_digests;
-+              d2i_EDIPARTYNAME;
-+              d2i_OCSP_SERVICELOC;
-+              ENGINE_get_digests;
-+              _ossl_old_des_set_odd_parity;
-+              OCSP_RESPDATA_free;
-+              d2i_KRB5_TICKET;
-+              OTHERNAME_it;
-+              EVP_MD_CTX_cleanup;
-+              d2i_ASN1_GENERALSTRING;
-+              X509_CRL_set_version;
-+              BN_mod_sub;
-+              OCSP_SINGLERESP_get_ext_by_NID;
-+              ENGINE_get_ex_new_index;
-+              OCSP_REQUEST_free;
-+              OCSP_REQUEST_add1_ext_i2d;
-+              X509_VAL_it;
-+              EC_POINTs_make_affine;
-+              EC_POINT_mul;
-+              X509V3_EXT_add_nconf;
-+              X509_TRUST_set;
-+              X509_CRL_add1_ext_i2d;
-+              _ossl_old_des_fcrypt;
-+              DISPLAYTEXT_it;
-+              X509_CRL_set_lastUpdate;
-+              OCSP_BASICRESP_free;
-+              OCSP_BASICRESP_add1_ext_i2d;
-+              d2i_KRB5_AUTHENTBODY;
-+              CRYPTO_set_ex_data_implementation;
-+              CRYPTO_set_ex_data_impl;
-+              KRB5_ENCDATA_new;
-+              DSO_up_ref;
-+              OCSP_crl_reason_str;
-+              UI_get0_result_string;
-+              ASN1_GENERALSTRING_new;
-+              X509_SIG_it;
-+              ERR_set_implementation;
-+              ERR_load_EC_strings;
-+              UI_get0_action_string;
-+              OCSP_ONEREQ_get_ext;
-+              EC_POINT_method_of;
-+              i2d_KRB5_APREQBODY;
-+              _ossl_old_des_ecb3_encrypt;
-+              CRYPTO_get_mem_ex_functions;
-+              ENGINE_get_ex_data;
-+              UI_destroy_method;
-+              ASN1_item_i2d_bio;
-+              OCSP_ONEREQ_get_ext_by_OBJ;
-+              ASN1_primitive_new;
-+              ASN1_PRINTABLE_it;
-+              EVP_aes_192_ecb;
-+              OCSP_SIGNATURE_new;
-+              LONG_it;
-+              ASN1_VISIBLESTRING_it;
-+              OCSP_SINGLERESP_add1_ext_i2d;
-+              d2i_OCSP_CERTID;
-+              ASN1_item_d2i_fp;
-+              CRL_DIST_POINTS_it;
-+              GENERAL_NAME_print;
-+              OCSP_SINGLERESP_delete_ext;
-+              PKCS12_SAFEBAGS_it;
-+              d2i_OCSP_SIGNATURE;
-+              OCSP_request_add1_nonce;
-+              ENGINE_set_cmd_defns;
-+              OCSP_SERVICELOC_free;
-+              EC_GROUP_free;
-+              ASN1_BIT_STRING_it;
-+              X509_REQ_it;
-+              _ossl_old_des_cbc_encrypt;
-+              ERR_unload_strings;
-+              PKCS7_SIGN_ENVELOPE_it;
-+              EDIPARTYNAME_free;
-+              OCSP_REQINFO_free;
-+              EC_GROUP_new_curve_GFp;
-+              OCSP_REQUEST_get1_ext_d2i;
-+              PKCS12_item_pack_safebag;
-+              asn1_ex_c2i;
-+              ENGINE_register_digests;
-+              i2d_OCSP_REVOKEDINFO;
-+              asn1_enc_restore;
-+              UI_free;
-+              UI_new_method;
-+              EVP_EncryptInit_ex;
-+              X509_pubkey_digest;
-+              EC_POINT_invert;
-+              OCSP_basic_sign;
-+              i2d_OCSP_RESPID;
-+              OCSP_check_nonce;
-+              ENGINE_ctrl_cmd;
-+              d2i_KRB5_ENCKEY;
-+              OCSP_parse_url;
-+              OCSP_SINGLERESP_get_ext;
-+              OCSP_CRLID_free;
-+              OCSP_BASICRESP_get1_ext_d2i;
-+              RSAPrivateKey_it;
-+              ENGINE_register_all_DH;
-+              i2d_EDIPARTYNAME;
-+              EC_POINT_get_affine_coordinates_GFp;
-+              EC_POINT_get_affine_coords_GFp;
-+              OCSP_CRLID_new;
-+              ENGINE_get_flags;
-+              OCSP_ONEREQ_it;
-+              UI_process;
-+              ASN1_INTEGER_it;
-+              EVP_CipherInit_ex;
-+              UI_get_string_type;
-+              ENGINE_unregister_DH;
-+              ENGINE_register_all_DSA;
-+              OCSP_ONEREQ_get_ext_by_critical;
-+              bn_dup_expand;
-+              OCSP_cert_id_new;
-+              BASIC_CONSTRAINTS_it;
-+              BN_mod_add_quick;
-+              EC_POINT_new;
-+              EVP_MD_CTX_destroy;
-+              OCSP_RESPBYTES_free;
-+              EVP_aes_128_cbc;
-+              OCSP_SINGLERESP_get1_ext_d2i;
-+              EC_POINT_free;
-+              DH_up_ref;
-+              X509_NAME_ENTRY_it;
-+              UI_get_ex_new_index;
-+              BN_mod_sub_quick;
-+              OCSP_ONEREQ_add_ext;
-+              OCSP_request_sign;
-+              EVP_DigestFinal_ex;
-+              ENGINE_set_digests;
-+              OCSP_id_issuer_cmp;
-+              OBJ_NAME_do_all;
-+              EC_POINTs_mul;
-+              ENGINE_register_complete;
-+              X509V3_EXT_nconf_nid;
-+              ASN1_SEQUENCE_it;
-+              UI_set_default_method;
-+              RAND_query_egd_bytes;
-+              UI_method_get_writer;
-+              UI_OpenSSL;
-+              PEM_def_callback;
-+              ENGINE_cleanup;
-+              DIST_POINT_it;
-+              OCSP_SINGLERESP_it;
-+              d2i_KRB5_TKTBODY;
-+              EC_POINT_cmp;
-+              OCSP_REVOKEDINFO_new;
-+              i2d_OCSP_CERTSTATUS;
-+              OCSP_basic_add1_nonce;
-+              ASN1_item_ex_d2i;
-+              BN_mod_lshift1_quick;
-+              UI_set_method;
-+              OCSP_id_get0_info;
-+              BN_mod_sqrt;
-+              EC_GROUP_copy;
-+              KRB5_ENCDATA_free;
-+              _ossl_old_des_cfb_encrypt;
-+              OCSP_SINGLERESP_get_ext_by_OBJ;
-+              OCSP_cert_to_id;
-+              OCSP_RESPID_new;
-+              OCSP_RESPDATA_it;
-+              d2i_OCSP_RESPDATA;
-+              ENGINE_register_all_complete;
-+              OCSP_check_validity;
-+              PKCS12_BAGS_it;
-+              OCSP_url_svcloc_new;
-+              ASN1_template_free;
-+              OCSP_SINGLERESP_add_ext;
-+              KRB5_AUTHENTBODY_it;
-+              X509_supported_extension;
-+              i2d_KRB5_AUTHDATA;
-+              UI_method_get_opener;
-+              ENGINE_set_ex_data;
-+              OCSP_REQUEST_print;
-+              CBIGNUM_it;
-+              KRB5_TICKET_new;
-+              KRB5_APREQ_new;
-+              EC_GROUP_get_curve_GFp;
-+              KRB5_ENCKEY_new;
-+              ASN1_template_d2i;
-+              _ossl_old_des_quad_cksum;
-+              OCSP_single_get0_status;
-+              BN_swap;
-+              POLICYINFO_it;
-+              ENGINE_set_destroy_function;
-+              asn1_enc_free;
-+              OCSP_RESPID_it;
-+              EC_GROUP_new;
-+              EVP_aes_256_cbc;
-+              i2d_KRB5_PRINCNAME;
-+              _ossl_old_des_encrypt2;
-+              _ossl_old_des_encrypt3;
-+              PKCS8_PRIV_KEY_INFO_it;
-+              OCSP_REQINFO_it;
-+              PBEPARAM_it;
-+              KRB5_AUTHENTBODY_new;
-+              X509_CRL_add0_revoked;
-+              EDIPARTYNAME_it;
-+              NETSCAPE_SPKI_it;
-+              UI_get0_test_string;
-+              ENGINE_get_cipher_engine;
-+              ENGINE_register_all_ciphers;
-+              EC_POINT_copy;
-+              BN_kronecker;
-+              _ossl_old_des_ede3_ofb64_encrypt;
-+              _ossl_odes_ede3_ofb64_encrypt;
-+              UI_method_get_reader;
-+              OCSP_BASICRESP_get_ext_count;
-+              ASN1_ENUMERATED_it;
-+              UI_set_result;
-+              i2d_KRB5_TICKET;
-+              X509_print_ex_fp;
-+              EVP_CIPHER_CTX_set_padding;
-+              d2i_OCSP_RESPONSE;
-+              ASN1_UTCTIME_it;
-+              _ossl_old_des_enc_write;
-+              OCSP_RESPONSE_new;
-+              AES_set_encrypt_key;
-+              OCSP_resp_count;
-+              KRB5_CHECKSUM_new;
-+              ENGINE_load_cswift;
-+              OCSP_onereq_get0_id;
-+              ENGINE_set_default_ciphers;
-+              NOTICEREF_it;
-+              X509V3_EXT_CRL_add_nconf;
-+              OCSP_REVOKEDINFO_it;
-+              AES_encrypt;
-+              OCSP_REQUEST_new;
-+              ASN1_ANY_it;
-+              CRYPTO_ex_data_new_class;
-+              _ossl_old_des_ncbc_encrypt;
-+              i2d_KRB5_TKTBODY;
-+              EC_POINT_clear_free;
-+              AES_decrypt;
-+              asn1_enc_init;
-+              UI_get_result_maxsize;
-+              OCSP_CERTID_new;
-+              ENGINE_unregister_RAND;
-+              UI_method_get_closer;
-+              d2i_KRB5_ENCDATA;
-+              OCSP_request_onereq_count;
-+              OCSP_basic_verify;
-+              KRB5_AUTHENTBODY_free;
-+              ASN1_item_d2i;
-+              ASN1_primitive_free;
-+              i2d_EXTENDED_KEY_USAGE;
-+              i2d_OCSP_SIGNATURE;
-+              asn1_enc_save;
-+              ENGINE_load_nuron;
-+              _ossl_old_des_pcbc_encrypt;
-+              PKCS12_MAC_DATA_it;
-+              OCSP_accept_responses_new;
-+              asn1_do_lock;
-+              PKCS7_ATTR_VERIFY_it;
-+              KRB5_APREQBODY_it;
-+              i2d_OCSP_SINGLERESP;
-+              ASN1_item_ex_new;
-+              UI_add_verify_string;
-+              _ossl_old_des_set_key;
-+              KRB5_PRINCNAME_it;
-+              EVP_DecryptInit_ex;
-+              i2d_OCSP_CERTID;
-+              ASN1_item_d2i_bio;
-+              EC_POINT_dbl;
-+              asn1_get_choice_selector;
-+              i2d_KRB5_CHECKSUM;
-+              ENGINE_set_table_flags;
-+              AES_options;
-+              ENGINE_load_chil;
-+              OCSP_id_cmp;
-+              OCSP_BASICRESP_new;
-+              OCSP_REQUEST_get_ext_by_NID;
-+              KRB5_APREQ_it;
-+              ENGINE_get_destroy_function;
-+              CONF_set_nconf;
-+              ASN1_PRINTABLE_free;
-+              OCSP_BASICRESP_get_ext_by_NID;
-+              DIST_POINT_NAME_it;
-+              X509V3_extensions_print;
-+              _ossl_old_des_cfb64_encrypt;
-+              X509_REVOKED_add1_ext_i2d;
-+              _ossl_old_des_ofb_encrypt;
-+              KRB5_TKTBODY_new;
-+              ASN1_OCTET_STRING_it;
-+              ERR_load_UI_strings;
-+              i2d_KRB5_ENCKEY;
-+              ASN1_template_new;
-+              OCSP_SIGNATURE_free;
-+              ASN1_item_i2d_fp;
-+              KRB5_PRINCNAME_free;
-+              PKCS7_RECIP_INFO_it;
-+              EXTENDED_KEY_USAGE_it;
-+              EC_GFp_simple_method;
-+              EC_GROUP_precompute_mult;
-+              OCSP_request_onereq_get0;
-+              UI_method_set_writer;
-+              KRB5_AUTHENT_new;
-+              X509_CRL_INFO_it;
-+              DSO_set_name_converter;
-+              AES_set_decrypt_key;
-+              PKCS7_DIGEST_it;
-+              PKCS12_x5092certbag;
-+              EVP_DigestInit_ex;
-+              i2a_ACCESS_DESCRIPTION;
-+              OCSP_RESPONSE_it;
-+              PKCS7_ENC_CONTENT_it;
-+              OCSP_request_add0_id;
-+              EC_POINT_make_affine;
-+              DSO_get_filename;
-+              OCSP_CERTSTATUS_it;
-+              OCSP_request_add1_cert;
-+              UI_get0_output_string;
-+              UI_dup_verify_string;
-+              BN_mod_lshift;
-+              KRB5_AUTHDATA_it;
-+              asn1_set_choice_selector;
-+              OCSP_basic_add1_status;
-+              OCSP_RESPID_free;
-+              asn1_get_field_ptr;
-+              UI_add_input_string;
-+              OCSP_CRLID_it;
-+              i2d_KRB5_AUTHENTBODY;
-+              OCSP_REQUEST_get_ext_count;
-+              ENGINE_load_atalla;
-+              X509_NAME_it;
-+              USERNOTICE_it;
-+              OCSP_REQINFO_new;
-+              OCSP_BASICRESP_get_ext;
-+              CRYPTO_get_ex_data_implementation;
-+              CRYPTO_get_ex_data_impl;
-+              ASN1_item_pack;
-+              i2d_KRB5_ENCDATA;
-+              X509_PURPOSE_set;
-+              X509_REQ_INFO_it;
-+              UI_method_set_opener;
-+              ASN1_item_ex_free;
-+              ASN1_BOOLEAN_it;
-+              ENGINE_get_table_flags;
-+              UI_create_method;
-+              OCSP_ONEREQ_add1_ext_i2d;
-+              _shadow_DES_check_key;
-+              d2i_OCSP_REQINFO;
-+              UI_add_info_string;
-+              UI_get_result_minsize;
-+              ASN1_NULL_it;
-+              BN_mod_lshift1;
-+              d2i_OCSP_ONEREQ;
-+              OCSP_ONEREQ_new;
-+              KRB5_TICKET_it;
-+              EVP_aes_192_cbc;
-+              KRB5_TICKET_free;
-+              UI_new;
-+              OCSP_response_create;
-+              _ossl_old_des_xcbc_encrypt;
-+              PKCS7_it;
-+              OCSP_REQUEST_get_ext_by_critical;
-+              OCSP_REQUEST_get_ext_by_crit;
-+              ENGINE_set_flags;
-+              _ossl_old_des_ecb_encrypt;
-+              OCSP_response_get1_basic;
-+              EVP_Digest;
-+              OCSP_ONEREQ_delete_ext;
-+              ASN1_TBOOLEAN_it;
-+              ASN1_item_new;
-+              ASN1_TIME_to_generalizedtime;
-+              BIGNUM_it;
-+              AES_cbc_encrypt;
-+              ENGINE_get_load_privkey_function;
-+              ENGINE_get_load_privkey_fn;
-+              OCSP_RESPONSE_free;
-+              UI_method_set_reader;
-+              i2d_ASN1_T61STRING;
-+              EC_POINT_set_to_infinity;
-+              ERR_load_OCSP_strings;
-+              EC_POINT_point2oct;
-+              KRB5_APREQ_free;
-+              ASN1_OBJECT_it;
-+              OCSP_crlID_new;
-+              OCSP_crlID2_new;
-+              CONF_modules_load_file;
-+              CONF_imodule_set_usr_data;
-+              ENGINE_set_default_string;
-+              CONF_module_get_usr_data;
-+              ASN1_add_oid_module;
-+              CONF_modules_finish;
-+              OPENSSL_config;
-+              CONF_modules_unload;
-+              CONF_imodule_get_value;
-+              CONF_module_set_usr_data;
-+              CONF_parse_list;
-+              CONF_module_add;
-+              CONF_get1_default_config_file;
-+              CONF_imodule_get_flags;
-+              CONF_imodule_get_module;
-+              CONF_modules_load;
-+              CONF_imodule_get_name;
-+              ERR_peek_top_error;
-+              CONF_imodule_get_usr_data;
-+              CONF_imodule_set_flags;
-+              ENGINE_add_conf_module;
-+              ERR_peek_last_error_line;
-+              ERR_peek_last_error_line_data;
-+              ERR_peek_last_error;
-+              DES_read_2passwords;
-+              DES_read_password;
-+              UI_UTIL_read_pw;
-+              UI_UTIL_read_pw_string;
-+              ENGINE_load_aep;
-+              ENGINE_load_sureware;
-+              OPENSSL_add_all_algorithms_noconf;
-+              OPENSSL_add_all_algo_noconf;
-+              OPENSSL_add_all_algorithms_conf;
-+              OPENSSL_add_all_algo_conf;
-+              OPENSSL_load_builtin_modules;
-+              AES_ofb128_encrypt;
-+              AES_ctr128_encrypt;
-+              AES_cfb128_encrypt;
-+              ENGINE_load_4758cca;
-+              _ossl_096_des_random_seed;
-+              EVP_aes_256_ofb;
-+              EVP_aes_192_ofb;
-+              EVP_aes_128_cfb128;
-+              EVP_aes_256_cfb128;
-+              EVP_aes_128_ofb;
-+              EVP_aes_192_cfb128;
-+              CONF_modules_free;
-+              NCONF_default;
-+              OPENSSL_no_config;
-+              NCONF_WIN32;
-+              ASN1_UNIVERSALSTRING_new;
-+              EVP_des_ede_ecb;
-+              i2d_ASN1_UNIVERSALSTRING;
-+              ASN1_UNIVERSALSTRING_free;
-+              ASN1_UNIVERSALSTRING_it;
-+              d2i_ASN1_UNIVERSALSTRING;
-+              EVP_des_ede3_ecb;
-+              X509_REQ_print_ex;
-+              ENGINE_up_ref;
-+              BUF_MEM_grow_clean;
-+              CRYPTO_realloc_clean;
-+              BUF_strlcat;
-+              BIO_indent;
-+              BUF_strlcpy;
-+              OpenSSLDie;
-+              OPENSSL_cleanse;
-+              ENGINE_setup_bsd_cryptodev;
-+              ERR_release_err_state_table;
-+              EVP_aes_128_cfb8;
-+              FIPS_corrupt_rsa;
-+              FIPS_selftest_des;
-+              EVP_aes_128_cfb1;
-+              EVP_aes_192_cfb8;
-+              FIPS_mode_set;
-+              FIPS_selftest_dsa;
-+              EVP_aes_256_cfb8;
-+              FIPS_allow_md5;
-+              DES_ede3_cfb_encrypt;
-+              EVP_des_ede3_cfb8;
-+              FIPS_rand_seeded;
-+              AES_cfbr_encrypt_block;
-+              AES_cfb8_encrypt;
-+              FIPS_rand_seed;
-+              FIPS_corrupt_des;
-+              EVP_aes_192_cfb1;
-+              FIPS_selftest_aes;
-+              FIPS_set_prng_key;
-+              EVP_des_cfb8;
-+              FIPS_corrupt_dsa;
-+              FIPS_test_mode;
-+              FIPS_rand_method;
-+              EVP_aes_256_cfb1;
-+              ERR_load_FIPS_strings;
-+              FIPS_corrupt_aes;
-+              FIPS_selftest_sha1;
-+              FIPS_selftest_rsa;
-+              FIPS_corrupt_sha1;
-+              EVP_des_cfb1;
-+              FIPS_dsa_check;
-+              AES_cfb1_encrypt;
-+              EVP_des_ede3_cfb1;
-+              FIPS_rand_check;
-+              FIPS_md5_allowed;
-+              FIPS_mode;
-+              FIPS_selftest_failed;
-+              sk_is_sorted;
-+              X509_check_ca;
-+              HMAC_CTX_set_flags;
-+              d2i_PROXY_CERT_INFO_EXTENSION;
-+              PROXY_POLICY_it;
-+              i2d_PROXY_POLICY;
-+              i2d_PROXY_CERT_INFO_EXTENSION;
-+              d2i_PROXY_POLICY;
-+              PROXY_CERT_INFO_EXTENSION_new;
-+              PROXY_CERT_INFO_EXTENSION_free;
-+              PROXY_CERT_INFO_EXTENSION_it;
-+              PROXY_POLICY_free;
-+              PROXY_POLICY_new;
-+              BN_MONT_CTX_set_locked;
-+              FIPS_selftest_rng;
-+              EVP_sha384;
-+              EVP_sha512;
-+              EVP_sha224;
-+              EVP_sha256;
-+              FIPS_selftest_hmac;
-+              FIPS_corrupt_rng;
-+              BN_mod_exp_mont_consttime;
-+              RSA_X931_hash_id;
-+              RSA_padding_check_X931;
-+              RSA_verify_PKCS1_PSS;
-+              RSA_padding_add_X931;
-+              RSA_padding_add_PKCS1_PSS;
-+              PKCS1_MGF1;
-+              BN_X931_generate_Xpq;
-+              RSA_X931_generate_key;
-+              BN_X931_derive_prime;
-+              BN_X931_generate_prime;
-+              RSA_X931_derive;
-+              BIO_new_dgram;
-+              BN_get0_nist_prime_384;
-+              ERR_set_mark;
-+              X509_STORE_CTX_set0_crls;
-+              ENGINE_set_STORE;
-+              ENGINE_register_ECDSA;
-+              STORE_meth_set_list_start_fn;
-+              STORE_method_set_list_start_function;
-+              BN_BLINDING_invert_ex;
-+              NAME_CONSTRAINTS_free;
-+              STORE_ATTR_INFO_set_number;
-+              BN_BLINDING_get_thread_id;
-+              X509_STORE_CTX_set0_param;
-+              POLICY_MAPPING_it;
-+              STORE_parse_attrs_start;
-+              POLICY_CONSTRAINTS_free;
-+              EVP_PKEY_add1_attr_by_NID;
-+              BN_nist_mod_192;
-+              EC_GROUP_get_trinomial_basis;
-+              STORE_set_method;
-+              GENERAL_SUBTREE_free;
-+              NAME_CONSTRAINTS_it;
-+              ECDH_get_default_method;
-+              PKCS12_add_safe;
-+              EC_KEY_new_by_curve_name;
-+              STORE_meth_get_update_store_fn;
-+              STORE_method_get_update_store_function;
-+              ENGINE_register_ECDH;
-+              SHA512_Update;
-+              i2d_ECPrivateKey;
-+              BN_get0_nist_prime_192;
-+              STORE_modify_certificate;
-+              EC_POINT_set_affine_coordinates_GF2m;
-+              EC_POINT_set_affine_coords_GF2m;
-+              BN_GF2m_mod_exp_arr;
-+              STORE_ATTR_INFO_modify_number;
-+              X509_keyid_get0;
-+              ENGINE_load_gmp;
-+              pitem_new;
-+              BN_GF2m_mod_mul_arr;
-+              STORE_list_public_key_endp;
-+              o2i_ECPublicKey;
-+              EC_KEY_copy;
-+              BIO_dump_fp;
-+              X509_policy_node_get0_parent;
-+              EC_GROUP_check_discriminant;
-+              i2o_ECPublicKey;
-+              EC_KEY_precompute_mult;
-+              a2i_IPADDRESS;
-+              STORE_meth_set_initialise_fn;
-+              STORE_method_set_initialise_function;
-+              X509_STORE_CTX_set_depth;
-+              X509_VERIFY_PARAM_inherit;
-+              EC_POINT_point2bn;
-+              STORE_ATTR_INFO_set_dn;
-+              X509_policy_tree_get0_policies;
-+              EC_GROUP_new_curve_GF2m;
-+              STORE_destroy_method;
-+              ENGINE_unregister_STORE;
-+              EVP_PKEY_get1_EC_KEY;
-+              STORE_ATTR_INFO_get0_number;
-+              ENGINE_get_default_ECDH;
-+              EC_KEY_get_conv_form;
-+              ASN1_OCTET_STRING_NDEF_it;
-+              STORE_delete_public_key;
-+              STORE_get_public_key;
-+              STORE_modify_arbitrary;
-+              ENGINE_get_static_state;
-+              pqueue_iterator;
-+              ECDSA_SIG_new;
-+              OPENSSL_DIR_end;
-+              BN_GF2m_mod_sqr;
-+              EC_POINT_bn2point;
-+              X509_VERIFY_PARAM_set_depth;
-+              EC_KEY_set_asn1_flag;
-+              STORE_get_method;
-+              EC_KEY_get_key_method_data;
-+              ECDSA_sign_ex;
-+              STORE_parse_attrs_end;
-+              EC_GROUP_get_point_conversion_form;
-+              EC_GROUP_get_point_conv_form;
-+              STORE_method_set_store_function;
-+              STORE_ATTR_INFO_in;
-+              PEM_read_bio_ECPKParameters;
-+              EC_GROUP_get_pentanomial_basis;
-+              EVP_PKEY_add1_attr_by_txt;
-+              BN_BLINDING_set_flags;
-+              X509_VERIFY_PARAM_set1_policies;
-+              X509_VERIFY_PARAM_set1_name;
-+              X509_VERIFY_PARAM_set_purpose;
-+              STORE_get_number;
-+              ECDSA_sign_setup;
-+              BN_GF2m_mod_solve_quad_arr;
-+              EC_KEY_up_ref;
-+              POLICY_MAPPING_free;
-+              BN_GF2m_mod_div;
-+              X509_VERIFY_PARAM_set_flags;
-+              EC_KEY_free;
-+              STORE_meth_set_list_next_fn;
-+              STORE_method_set_list_next_function;
-+              PEM_write_bio_ECPrivateKey;
-+              d2i_EC_PUBKEY;
-+              STORE_meth_get_generate_fn;
-+              STORE_method_get_generate_function;
-+              STORE_meth_set_list_end_fn;
-+              STORE_method_set_list_end_function;
-+              pqueue_print;
-+              EC_GROUP_have_precompute_mult;
-+              EC_KEY_print_fp;
-+              BN_GF2m_mod_arr;
-+              PEM_write_bio_X509_CERT_PAIR;
-+              EVP_PKEY_cmp;
-+              X509_policy_level_node_count;
-+              STORE_new_engine;
-+              STORE_list_public_key_start;
-+              X509_VERIFY_PARAM_new;
-+              ECDH_get_ex_data;
-+              EVP_PKEY_get_attr;
-+              ECDSA_do_sign;
-+              ENGINE_unregister_ECDH;
-+              ECDH_OpenSSL;
-+              EC_KEY_set_conv_form;
-+              EC_POINT_dup;
-+              GENERAL_SUBTREE_new;
-+              STORE_list_crl_endp;
-+              EC_get_builtin_curves;
-+              X509_policy_node_get0_qualifiers;
-+              X509_pcy_node_get0_qualifiers;
-+              STORE_list_crl_end;
-+              EVP_PKEY_set1_EC_KEY;
-+              BN_GF2m_mod_sqrt_arr;
-+              i2d_ECPrivateKey_bio;
-+              ECPKParameters_print_fp;
-+              pqueue_find;
-+              ECDSA_SIG_free;
-+              PEM_write_bio_ECPKParameters;
-+              STORE_method_set_ctrl_function;
-+              STORE_list_public_key_end;
-+              EC_KEY_set_private_key;
-+              pqueue_peek;
-+              STORE_get_arbitrary;
-+              STORE_store_crl;
-+              X509_policy_node_get0_policy;
-+              PKCS12_add_safes;
-+              BN_BLINDING_convert_ex;
-+              X509_policy_tree_free;
-+              OPENSSL_ia32cap_loc;
-+              BN_GF2m_poly2arr;
-+              STORE_ctrl;
-+              STORE_ATTR_INFO_compare;
-+              BN_get0_nist_prime_224;
-+              i2d_ECParameters;
-+              i2d_ECPKParameters;
-+              BN_GENCB_call;
-+              d2i_ECPKParameters;
-+              STORE_meth_set_generate_fn;
-+              STORE_method_set_generate_function;
-+              ENGINE_set_ECDH;
-+              NAME_CONSTRAINTS_new;
-+              SHA256_Init;
-+              EC_KEY_get0_public_key;
-+              PEM_write_bio_EC_PUBKEY;
-+              STORE_ATTR_INFO_set_cstr;
-+              STORE_list_crl_next;
-+              STORE_ATTR_INFO_in_range;
-+              ECParameters_print;
-+              STORE_meth_set_delete_fn;
-+              STORE_method_set_delete_function;
-+              STORE_list_certificate_next;
-+              ASN1_generate_nconf;
-+              BUF_memdup;
-+              BN_GF2m_mod_mul;
-+              STORE_meth_get_list_next_fn;
-+              STORE_method_get_list_next_function;
-+              STORE_ATTR_INFO_get0_dn;
-+              STORE_list_private_key_next;
-+              EC_GROUP_set_seed;
-+              X509_VERIFY_PARAM_set_trust;
-+              STORE_ATTR_INFO_free;
-+              STORE_get_private_key;
-+              EVP_PKEY_get_attr_count;
-+              STORE_ATTR_INFO_new;
-+              EC_GROUP_get_curve_GF2m;
-+              STORE_meth_set_revoke_fn;
-+              STORE_method_set_revoke_function;
-+              STORE_store_number;
-+              BN_is_prime_ex;
-+              STORE_revoke_public_key;
-+              X509_STORE_CTX_get0_param;
-+              STORE_delete_arbitrary;
-+              PEM_read_X509_CERT_PAIR;
-+              X509_STORE_set_depth;
-+              ECDSA_get_ex_data;
-+              SHA224;
-+              BIO_dump_indent_fp;
-+              EC_KEY_set_group;
-+              BUF_strndup;
-+              STORE_list_certificate_start;
-+              BN_GF2m_mod;
-+              X509_REQ_check_private_key;
-+              EC_GROUP_get_seed_len;
-+              ERR_load_STORE_strings;
-+              PEM_read_bio_EC_PUBKEY;
-+              STORE_list_private_key_end;
-+              i2d_EC_PUBKEY;
-+              ECDSA_get_default_method;
-+              ASN1_put_eoc;
-+              X509_STORE_CTX_get_explicit_policy;
-+              X509_STORE_CTX_get_expl_policy;
-+              X509_VERIFY_PARAM_table_cleanup;
-+              STORE_modify_private_key;
-+              X509_VERIFY_PARAM_free;
-+              EC_METHOD_get_field_type;
-+              EC_GFp_nist_method;
-+              STORE_meth_set_modify_fn;
-+              STORE_method_set_modify_function;
-+              STORE_parse_attrs_next;
-+              ENGINE_load_padlock;
-+              EC_GROUP_set_curve_name;
-+              X509_CERT_PAIR_it;
-+              STORE_meth_get_revoke_fn;
-+              STORE_method_get_revoke_function;
-+              STORE_method_set_get_function;
-+              STORE_modify_number;
-+              STORE_method_get_store_function;
-+              STORE_store_private_key;
-+              BN_GF2m_mod_sqr_arr;
-+              RSA_setup_blinding;
-+              BIO_s_datagram;
-+              STORE_Memory;
-+              sk_find_ex;
-+              EC_GROUP_set_curve_GF2m;
-+              ENGINE_set_default_ECDSA;
-+              POLICY_CONSTRAINTS_new;
-+              BN_GF2m_mod_sqrt;
-+              ECDH_set_default_method;
-+              EC_KEY_generate_key;
-+              SHA384_Update;
-+              BN_GF2m_arr2poly;
-+              STORE_method_get_get_function;
-+              STORE_meth_set_cleanup_fn;
-+              STORE_method_set_cleanup_function;
-+              EC_GROUP_check;
-+              d2i_ECPrivateKey_bio;
-+              EC_KEY_insert_key_method_data;
-+              STORE_meth_get_lock_store_fn;
-+              STORE_method_get_lock_store_function;
-+              X509_VERIFY_PARAM_get_depth;
-+              SHA224_Final;
-+              STORE_meth_set_update_store_fn;
-+              STORE_method_set_update_store_function;
-+              SHA224_Update;
-+              d2i_ECPrivateKey;
-+              ASN1_item_ndef_i2d;
-+              STORE_delete_private_key;
-+              ERR_pop_to_mark;
-+              ENGINE_register_all_STORE;
-+              X509_policy_level_get0_node;
-+              i2d_PKCS7_NDEF;
-+              EC_GROUP_get_degree;
-+              ASN1_generate_v3;
-+              STORE_ATTR_INFO_modify_cstr;
-+              X509_policy_tree_level_count;
-+              BN_GF2m_add;
-+              EC_KEY_get0_group;
-+              STORE_generate_crl;
-+              STORE_store_public_key;
-+              X509_CERT_PAIR_free;
-+              STORE_revoke_private_key;
-+              BN_nist_mod_224;
-+              SHA512_Final;
-+              STORE_ATTR_INFO_modify_dn;
-+              STORE_meth_get_initialise_fn;
-+              STORE_method_get_initialise_function;
-+              STORE_delete_number;
-+              i2d_EC_PUBKEY_bio;
-+              BIO_dgram_non_fatal_error;
-+              EC_GROUP_get_asn1_flag;
-+              STORE_ATTR_INFO_in_ex;
-+              STORE_list_crl_start;
-+              ECDH_get_ex_new_index;
-+              STORE_meth_get_modify_fn;
-+              STORE_method_get_modify_function;
-+              v2i_ASN1_BIT_STRING;
-+              STORE_store_certificate;
-+              OBJ_bsearch_ex;
-+              X509_STORE_CTX_set_default;
-+              STORE_ATTR_INFO_set_sha1str;
-+              BN_GF2m_mod_inv;
-+              BN_GF2m_mod_exp;
-+              STORE_modify_public_key;
-+              STORE_meth_get_list_start_fn;
-+              STORE_method_get_list_start_function;
-+              EC_GROUP_get0_seed;
-+              STORE_store_arbitrary;
-+              STORE_meth_set_unlock_store_fn;
-+              STORE_method_set_unlock_store_function;
-+              BN_GF2m_mod_div_arr;
-+              ENGINE_set_ECDSA;
-+              STORE_create_method;
-+              ECPKParameters_print;
-+              EC_KEY_get0_private_key;
-+              PEM_write_EC_PUBKEY;
-+              X509_VERIFY_PARAM_set1;
-+              ECDH_set_method;
-+              v2i_GENERAL_NAME_ex;
-+              ECDH_set_ex_data;
-+              STORE_generate_key;
-+              BN_nist_mod_521;
-+              X509_policy_tree_get0_level;
-+              EC_GROUP_set_point_conversion_form;
-+              EC_GROUP_set_point_conv_form;
-+              PEM_read_EC_PUBKEY;
-+              i2d_ECDSA_SIG;
-+              ECDSA_OpenSSL;
-+              STORE_delete_crl;
-+              EC_KEY_get_enc_flags;
-+              ASN1_const_check_infinite_end;
-+              EVP_PKEY_delete_attr;
-+              ECDSA_set_default_method;
-+              EC_POINT_set_compressed_coordinates_GF2m;
-+              EC_POINT_set_compr_coords_GF2m;
-+              EC_GROUP_cmp;
-+              STORE_revoke_certificate;
-+              BN_get0_nist_prime_256;
-+              STORE_meth_get_delete_fn;
-+              STORE_method_get_delete_function;
-+              SHA224_Init;
-+              PEM_read_ECPrivateKey;
-+              SHA512_Init;
-+              STORE_parse_attrs_endp;
-+              BN_set_negative;
-+              ERR_load_ECDSA_strings;
-+              EC_GROUP_get_basis_type;
-+              STORE_list_public_key_next;
-+              i2v_ASN1_BIT_STRING;
-+              STORE_OBJECT_free;
-+              BN_nist_mod_384;
-+              i2d_X509_CERT_PAIR;
-+              PEM_write_ECPKParameters;
-+              ECDH_compute_key;
-+              STORE_ATTR_INFO_get0_sha1str;
-+              ENGINE_register_all_ECDH;
-+              pqueue_pop;
-+              STORE_ATTR_INFO_get0_cstr;
-+              POLICY_CONSTRAINTS_it;
-+              STORE_get_ex_new_index;
-+              EVP_PKEY_get_attr_by_OBJ;
-+              X509_VERIFY_PARAM_add0_policy;
-+              BN_GF2m_mod_solve_quad;
-+              SHA256;
-+              i2d_ECPrivateKey_fp;
-+              X509_policy_tree_get0_user_policies;
-+              X509_pcy_tree_get0_usr_policies;
-+              OPENSSL_DIR_read;
-+              ENGINE_register_all_ECDSA;
-+              X509_VERIFY_PARAM_lookup;
-+              EC_POINT_get_affine_coordinates_GF2m;
-+              EC_POINT_get_affine_coords_GF2m;
-+              EC_GROUP_dup;
-+              ENGINE_get_default_ECDSA;
-+              EC_KEY_new;
-+              SHA256_Transform;
-+              EC_KEY_set_enc_flags;
-+              ECDSA_verify;
-+              EC_POINT_point2hex;
-+              ENGINE_get_STORE;
-+              SHA512;
-+              STORE_get_certificate;
-+              ECDSA_do_sign_ex;
-+              ECDSA_do_verify;
-+              d2i_ECPrivateKey_fp;
-+              STORE_delete_certificate;
-+              SHA512_Transform;
-+              X509_STORE_set1_param;
-+              STORE_method_get_ctrl_function;
-+              STORE_free;
-+              PEM_write_ECPrivateKey;
-+              STORE_meth_get_unlock_store_fn;
-+              STORE_method_get_unlock_store_function;
-+              STORE_get_ex_data;
-+              EC_KEY_set_public_key;
-+              PEM_read_ECPKParameters;
-+              X509_CERT_PAIR_new;
-+              ENGINE_register_STORE;
-+              RSA_generate_key_ex;
-+              DSA_generate_parameters_ex;
-+              ECParameters_print_fp;
-+              X509V3_NAME_from_section;
-+              EVP_PKEY_add1_attr;
-+              STORE_modify_crl;
-+              STORE_list_private_key_start;
-+              POLICY_MAPPINGS_it;
-+              GENERAL_SUBTREE_it;
-+              EC_GROUP_get_curve_name;
-+              PEM_write_X509_CERT_PAIR;
-+              BIO_dump_indent_cb;
-+              d2i_X509_CERT_PAIR;
-+              STORE_list_private_key_endp;
-+              asn1_const_Finish;
-+              i2d_EC_PUBKEY_fp;
-+              BN_nist_mod_256;
-+              X509_VERIFY_PARAM_add0_table;
-+              pqueue_free;
-+              BN_BLINDING_create_param;
-+              ECDSA_size;
-+              d2i_EC_PUBKEY_bio;
-+              BN_get0_nist_prime_521;
-+              STORE_ATTR_INFO_modify_sha1str;
-+              BN_generate_prime_ex;
-+              EC_GROUP_new_by_curve_name;
-+              SHA256_Final;
-+              DH_generate_parameters_ex;
-+              PEM_read_bio_ECPrivateKey;
-+              STORE_meth_get_cleanup_fn;
-+              STORE_method_get_cleanup_function;
-+              ENGINE_get_ECDH;
-+              d2i_ECDSA_SIG;
-+              BN_is_prime_fasttest_ex;
-+              ECDSA_sign;
-+              X509_policy_check;
-+              EVP_PKEY_get_attr_by_NID;
-+              STORE_set_ex_data;
-+              ENGINE_get_ECDSA;
-+              EVP_ecdsa;
-+              BN_BLINDING_get_flags;
-+              PKCS12_add_cert;
-+              STORE_OBJECT_new;
-+              ERR_load_ECDH_strings;
-+              EC_KEY_dup;
-+              EVP_CIPHER_CTX_rand_key;
-+              ECDSA_set_method;
-+              a2i_IPADDRESS_NC;
-+              d2i_ECParameters;
-+              STORE_list_certificate_end;
-+              STORE_get_crl;
-+              X509_POLICY_NODE_print;
-+              SHA384_Init;
-+              EC_GF2m_simple_method;
-+              ECDSA_set_ex_data;
-+              SHA384_Final;
-+              PKCS7_set_digest;
-+              EC_KEY_print;
-+              STORE_meth_set_lock_store_fn;
-+              STORE_method_set_lock_store_function;
-+              ECDSA_get_ex_new_index;
-+              SHA384;
-+              POLICY_MAPPING_new;
-+              STORE_list_certificate_endp;
-+              X509_STORE_CTX_get0_policy_tree;
-+              EC_GROUP_set_asn1_flag;
-+              EC_KEY_check_key;
-+              d2i_EC_PUBKEY_fp;
-+              PKCS7_set0_type_other;
-+              PEM_read_bio_X509_CERT_PAIR;
-+              pqueue_next;
-+              STORE_meth_get_list_end_fn;
-+              STORE_method_get_list_end_function;
-+              EVP_PKEY_add1_attr_by_OBJ;
-+              X509_VERIFY_PARAM_set_time;
-+              pqueue_new;
-+              ENGINE_set_default_ECDH;
-+              STORE_new_method;
-+              PKCS12_add_key;
-+              DSO_merge;
-+              EC_POINT_hex2point;
-+              BIO_dump_cb;
-+              SHA256_Update;
-+              pqueue_insert;
-+              pitem_free;
-+              BN_GF2m_mod_inv_arr;
-+              ENGINE_unregister_ECDSA;
-+              BN_BLINDING_set_thread_id;
-+              get_rfc3526_prime_8192;
-+              X509_VERIFY_PARAM_clear_flags;
-+              get_rfc2409_prime_1024;
-+              DH_check_pub_key;
-+              get_rfc3526_prime_2048;
-+              get_rfc3526_prime_6144;
-+              get_rfc3526_prime_1536;
-+              get_rfc3526_prime_3072;
-+              get_rfc3526_prime_4096;
-+              get_rfc2409_prime_768;
-+              X509_VERIFY_PARAM_get_flags;
-+              EVP_CIPHER_CTX_new;
-+              EVP_CIPHER_CTX_free;
-+              Camellia_cbc_encrypt;
-+              Camellia_cfb128_encrypt;
-+              Camellia_cfb1_encrypt;
-+              Camellia_cfb8_encrypt;
-+              Camellia_ctr128_encrypt;
-+              Camellia_cfbr_encrypt_block;
-+              Camellia_decrypt;
-+              Camellia_ecb_encrypt;
-+              Camellia_encrypt;
-+              Camellia_ofb128_encrypt;
-+              Camellia_set_key;
-+              EVP_camellia_128_cbc;
-+              EVP_camellia_128_cfb128;
-+              EVP_camellia_128_cfb1;
-+              EVP_camellia_128_cfb8;
-+              EVP_camellia_128_ecb;
-+              EVP_camellia_128_ofb;
-+              EVP_camellia_192_cbc;
-+              EVP_camellia_192_cfb128;
-+              EVP_camellia_192_cfb1;
-+              EVP_camellia_192_cfb8;
-+              EVP_camellia_192_ecb;
-+              EVP_camellia_192_ofb;
-+              EVP_camellia_256_cbc;
-+              EVP_camellia_256_cfb128;
-+              EVP_camellia_256_cfb1;
-+              EVP_camellia_256_cfb8;
-+              EVP_camellia_256_ecb;
-+              EVP_camellia_256_ofb;
-+              a2i_ipadd;
-+              ASIdentifiers_free;
-+              i2d_ASIdOrRange;
-+              EVP_CIPHER_block_size;
-+              v3_asid_is_canonical;
-+              IPAddressChoice_free;
-+              EVP_CIPHER_CTX_set_app_data;
-+              BIO_set_callback_arg;
-+              v3_addr_add_prefix;
-+              IPAddressOrRange_it;
-+              BIO_set_flags;
-+              ASIdentifiers_it;
-+              v3_addr_get_range;
-+              BIO_method_type;
-+              v3_addr_inherits;
-+              IPAddressChoice_it;
-+              AES_ige_encrypt;
-+              v3_addr_add_range;
-+              EVP_CIPHER_CTX_nid;
-+              d2i_ASRange;
-+              v3_addr_add_inherit;
-+              v3_asid_add_id_or_range;
-+              v3_addr_validate_resource_set;
-+              EVP_CIPHER_iv_length;
-+              EVP_MD_type;
-+              v3_asid_canonize;
-+              IPAddressRange_free;
-+              v3_asid_add_inherit;
-+              EVP_CIPHER_CTX_key_length;
-+              IPAddressRange_new;
-+              ASIdOrRange_new;
-+              EVP_MD_size;
-+              EVP_MD_CTX_test_flags;
-+              BIO_clear_flags;
-+              i2d_ASRange;
-+              IPAddressRange_it;
-+              IPAddressChoice_new;
-+              ASIdentifierChoice_new;
-+              ASRange_free;
-+              EVP_MD_pkey_type;
-+              EVP_MD_CTX_clear_flags;
-+              IPAddressFamily_free;
-+              i2d_IPAddressFamily;
-+              IPAddressOrRange_new;
-+              EVP_CIPHER_flags;
-+              v3_asid_validate_resource_set;
-+              d2i_IPAddressRange;
-+              AES_bi_ige_encrypt;
-+              BIO_get_callback;
-+              IPAddressOrRange_free;
-+              v3_addr_subset;
-+              d2i_IPAddressFamily;
-+              v3_asid_subset;
-+              BIO_test_flags;
-+              i2d_ASIdentifierChoice;
-+              ASRange_it;
-+              d2i_ASIdentifiers;
-+              ASRange_new;
-+              d2i_IPAddressChoice;
-+              v3_addr_get_afi;
-+              EVP_CIPHER_key_length;
-+              EVP_Cipher;
-+              i2d_IPAddressOrRange;
-+              ASIdOrRange_it;
-+              EVP_CIPHER_nid;
-+              i2d_IPAddressChoice;
-+              EVP_CIPHER_CTX_block_size;
-+              ASIdentifiers_new;
-+              v3_addr_validate_path;
-+              IPAddressFamily_new;
-+              EVP_MD_CTX_set_flags;
-+              v3_addr_is_canonical;
-+              i2d_IPAddressRange;
-+              IPAddressFamily_it;
-+              v3_asid_inherits;
-+              EVP_CIPHER_CTX_cipher;
-+              EVP_CIPHER_CTX_get_app_data;
-+              EVP_MD_block_size;
-+              EVP_CIPHER_CTX_flags;
-+              v3_asid_validate_path;
-+              d2i_IPAddressOrRange;
-+              v3_addr_canonize;
-+              ASIdentifierChoice_it;
-+              EVP_MD_CTX_md;
-+              d2i_ASIdentifierChoice;
-+              BIO_method_name;
-+              EVP_CIPHER_CTX_iv_length;
-+              ASIdOrRange_free;
-+              ASIdentifierChoice_free;
-+              BIO_get_callback_arg;
-+              BIO_set_callback;
-+              d2i_ASIdOrRange;
-+              i2d_ASIdentifiers;
-+              SEED_decrypt;
-+              SEED_encrypt;
-+              SEED_cbc_encrypt;
-+              EVP_seed_ofb;
-+              SEED_cfb128_encrypt;
-+              SEED_ofb128_encrypt;
-+              EVP_seed_cbc;
-+              SEED_ecb_encrypt;
-+              EVP_seed_ecb;
-+              SEED_set_key;
-+              EVP_seed_cfb128;
-+              X509_EXTENSIONS_it;
-+              X509_get1_ocsp;
-+              OCSP_REQ_CTX_free;
-+              i2d_X509_EXTENSIONS;
-+              OCSP_sendreq_nbio;
-+              OCSP_sendreq_new;
-+              d2i_X509_EXTENSIONS;
-+              X509_ALGORS_it;
-+              X509_ALGOR_get0;
-+              X509_ALGOR_set0;
-+              AES_unwrap_key;
-+              AES_wrap_key;
-+              X509at_get0_data_by_OBJ;
-+              ASN1_TYPE_set1;
-+              ASN1_STRING_set0;
-+              i2d_X509_ALGORS;
-+              BIO_f_zlib;
-+              COMP_zlib_cleanup;
-+              d2i_X509_ALGORS;
-+              CMS_ReceiptRequest_free;
-+              PEM_write_CMS;
-+              CMS_add0_CertificateChoices;
-+              CMS_unsigned_add1_attr_by_OBJ;
-+              ERR_load_CMS_strings;
-+              CMS_sign_receipt;
-+              i2d_CMS_ContentInfo;
-+              CMS_signed_delete_attr;
-+              d2i_CMS_bio;
-+              CMS_unsigned_get_attr_by_NID;
-+              CMS_verify;
-+              SMIME_read_CMS;
-+              CMS_decrypt_set1_key;
-+              CMS_SignerInfo_get0_algs;
-+              CMS_add1_cert;
-+              CMS_set_detached;
-+              CMS_encrypt;
-+              CMS_EnvelopedData_create;
-+              CMS_uncompress;
-+              CMS_add0_crl;
-+              CMS_SignerInfo_verify_content;
-+              CMS_unsigned_get0_data_by_OBJ;
-+              PEM_write_bio_CMS;
-+              CMS_unsigned_get_attr;
-+              CMS_RecipientInfo_ktri_cert_cmp;
-+              CMS_RecipientInfo_ktri_get0_algs;
-+              CMS_RecipInfo_ktri_get0_algs;
-+              CMS_ContentInfo_free;
-+              CMS_final;
-+              CMS_add_simple_smimecap;
-+              CMS_SignerInfo_verify;
-+              CMS_data;
-+              CMS_ContentInfo_it;
-+              d2i_CMS_ReceiptRequest;
-+              CMS_compress;
-+              CMS_digest_create;
-+              CMS_SignerInfo_cert_cmp;
-+              CMS_SignerInfo_sign;
-+              CMS_data_create;
-+              i2d_CMS_bio;
-+              CMS_EncryptedData_set1_key;
-+              CMS_decrypt;
-+              int_smime_write_ASN1;
-+              CMS_unsigned_delete_attr;
-+              CMS_unsigned_get_attr_count;
-+              CMS_add_smimecap;
-+              PEM_read_CMS;
-+              CMS_signed_get_attr_by_OBJ;
-+              d2i_CMS_ContentInfo;
-+              CMS_add_standard_smimecap;
-+              CMS_ContentInfo_new;
-+              CMS_RecipientInfo_type;
-+              CMS_get0_type;
-+              CMS_is_detached;
-+              CMS_sign;
-+              CMS_signed_add1_attr;
-+              CMS_unsigned_get_attr_by_OBJ;
-+              SMIME_write_CMS;
-+              CMS_EncryptedData_decrypt;
-+              CMS_get0_RecipientInfos;
-+              CMS_add0_RevocationInfoChoice;
-+              CMS_decrypt_set1_pkey;
-+              CMS_SignerInfo_set1_signer_cert;
-+              CMS_get0_signers;
-+              CMS_ReceiptRequest_get0_values;
-+              CMS_signed_get0_data_by_OBJ;
-+              CMS_get0_SignerInfos;
-+              CMS_add0_cert;
-+              CMS_EncryptedData_encrypt;
-+              CMS_digest_verify;
-+              CMS_set1_signers_certs;
-+              CMS_signed_get_attr;
-+              CMS_RecipientInfo_set0_key;
-+              CMS_SignedData_init;
-+              CMS_RecipientInfo_kekri_get0_id;
-+              CMS_verify_receipt;
-+              CMS_ReceiptRequest_it;
-+              PEM_read_bio_CMS;
-+              CMS_get1_crls;
-+              CMS_add0_recipient_key;
-+              SMIME_read_ASN1;
-+              CMS_ReceiptRequest_new;
-+              CMS_get0_content;
-+              CMS_get1_ReceiptRequest;
-+              CMS_signed_add1_attr_by_OBJ;
-+              CMS_RecipientInfo_kekri_id_cmp;
-+              CMS_add1_ReceiptRequest;
-+              CMS_SignerInfo_get0_signer_id;
-+              CMS_unsigned_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr;
-+              CMS_signed_get_attr_by_NID;
-+              CMS_get1_certs;
-+              CMS_signed_add1_attr_by_NID;
-+              CMS_unsigned_add1_attr_by_txt;
-+              CMS_dataFinal;
-+              CMS_RecipientInfo_ktri_get0_signer_id;
-+              CMS_RecipInfo_ktri_get0_sigr_id;
-+              i2d_CMS_ReceiptRequest;
-+              CMS_add1_recipient_cert;
-+              CMS_dataInit;
-+              CMS_signed_add1_attr_by_txt;
-+              CMS_RecipientInfo_decrypt;
-+              CMS_signed_get_attr_count;
-+              CMS_get0_eContentType;
-+              CMS_set1_eContentType;
-+              CMS_ReceiptRequest_create0;
-+              CMS_add1_signer;
-+              CMS_RecipientInfo_set0_pkey;
-+              ENGINE_set_load_ssl_client_cert_function;
-+              ENGINE_set_ld_ssl_clnt_cert_fn;
-+              ENGINE_get_ssl_client_cert_function;
-+              ENGINE_get_ssl_client_cert_fn;
-+              ENGINE_load_ssl_client_cert;
-+              ENGINE_load_capi;
-+              OPENSSL_isservice;
-+              FIPS_dsa_sig_decode;
-+              EVP_CIPHER_CTX_clear_flags;
-+              FIPS_rand_status;
-+              FIPS_rand_set_key;
-+              CRYPTO_set_mem_info_functions;
-+              RSA_X931_generate_key_ex;
-+              int_ERR_set_state_func;
-+              int_EVP_MD_set_engine_callbacks;
-+              int_CRYPTO_set_do_dynlock_callback;
-+              FIPS_rng_stick;
-+              EVP_CIPHER_CTX_set_flags;
-+              BN_X931_generate_prime_ex;
-+              FIPS_selftest_check;
-+              FIPS_rand_set_dt;
-+              CRYPTO_dbg_pop_info;
-+              FIPS_dsa_free;
-+              RSA_X931_derive_ex;
-+              FIPS_rsa_new;
-+              FIPS_rand_bytes;
-+              fips_cipher_test;
-+              EVP_CIPHER_CTX_test_flags;
-+              CRYPTO_malloc_debug_init;
-+              CRYPTO_dbg_push_info;
-+              FIPS_corrupt_rsa_keygen;
-+              FIPS_dh_new;
-+              FIPS_corrupt_dsa_keygen;
-+              FIPS_dh_free;
-+              fips_pkey_signature_test;
-+              EVP_add_alg_module;
-+              int_RAND_init_engine_callbacks;
-+              int_EVP_CIPHER_set_engine_callbacks;
-+              int_EVP_MD_init_engine_callbacks;
-+              FIPS_rand_test_mode;
-+              FIPS_rand_reset;
-+              FIPS_dsa_new;
-+              int_RAND_set_callbacks;
-+              BN_X931_derive_prime_ex;
-+              int_ERR_lib_init;
-+              int_EVP_CIPHER_init_engine_callbacks;
-+              FIPS_rsa_free;
-+              FIPS_dsa_sig_encode;
-+              CRYPTO_dbg_remove_all_info;
-+              OPENSSL_init;
-+              CRYPTO_strdup;
-+              JPAKE_STEP3A_process;
-+              JPAKE_STEP1_release;
-+              JPAKE_get_shared_key;
-+              JPAKE_STEP3B_init;
-+              JPAKE_STEP1_generate;
-+              JPAKE_STEP1_init;
-+              JPAKE_STEP3B_process;
-+              JPAKE_STEP2_generate;
-+              JPAKE_CTX_new;
-+              JPAKE_CTX_free;
-+              JPAKE_STEP3B_release;
-+              JPAKE_STEP3A_release;
-+              JPAKE_STEP2_process;
-+              JPAKE_STEP3B_generate;
-+              JPAKE_STEP1_process;
-+              JPAKE_STEP3A_generate;
-+              JPAKE_STEP2_release;
-+              JPAKE_STEP3A_init;
-+              ERR_load_JPAKE_strings;
-+              JPAKE_STEP2_init;
-+              pqueue_size;
-+              i2d_TS_ACCURACY;
-+              i2d_TS_MSG_IMPRINT_fp;
-+              i2d_TS_MSG_IMPRINT;
-+              EVP_PKEY_print_public;
-+              EVP_PKEY_CTX_new;
-+              i2d_TS_TST_INFO;
-+              EVP_PKEY_asn1_find;
-+              DSO_METHOD_beos;
-+              TS_CONF_load_cert;
-+              TS_REQ_get_ext;
-+              EVP_PKEY_sign_init;
-+              ASN1_item_print;
-+              TS_TST_INFO_set_nonce;
-+              TS_RESP_dup;
-+              ENGINE_register_pkey_meths;
-+              EVP_PKEY_asn1_add0;
-+              PKCS7_add0_attrib_signing_time;
-+              i2d_TS_TST_INFO_fp;
-+              BIO_asn1_get_prefix;
-+              TS_TST_INFO_set_time;
-+              EVP_PKEY_meth_set_decrypt;
-+              EVP_PKEY_set_type_str;
-+              EVP_PKEY_CTX_get_keygen_info;
-+              TS_REQ_set_policy_id;
-+              d2i_TS_RESP_fp;
-+              ENGINE_get_pkey_asn1_meth_engine;
-+              ENGINE_get_pkey_asn1_meth_eng;
-+              WHIRLPOOL_Init;
-+              TS_RESP_set_status_info;
-+              EVP_PKEY_keygen;
-+              EVP_DigestSignInit;
-+              TS_ACCURACY_set_millis;
-+              TS_REQ_dup;
-+              GENERAL_NAME_dup;
-+              ASN1_SEQUENCE_ANY_it;
-+              WHIRLPOOL;
-+              X509_STORE_get1_crls;
-+              ENGINE_get_pkey_asn1_meth;
-+              EVP_PKEY_asn1_new;
-+              BIO_new_NDEF;
-+              ENGINE_get_pkey_meth;
-+              TS_MSG_IMPRINT_set_algo;
-+              i2d_TS_TST_INFO_bio;
-+              TS_TST_INFO_set_ordering;
-+              TS_TST_INFO_get_ext_by_OBJ;
-+              CRYPTO_THREADID_set_pointer;
-+              TS_CONF_get_tsa_section;
-+              SMIME_write_ASN1;
-+              TS_RESP_CTX_set_signer_key;
-+              EVP_PKEY_encrypt_old;
-+              EVP_PKEY_encrypt_init;
-+              CRYPTO_THREADID_cpy;
-+              ASN1_PCTX_get_cert_flags;
-+              i2d_ESS_SIGNING_CERT;
-+              TS_CONF_load_key;
-+              i2d_ASN1_SEQUENCE_ANY;
-+              d2i_TS_MSG_IMPRINT_bio;
-+              EVP_PKEY_asn1_set_public;
-+              b2i_PublicKey_bio;
-+              BIO_asn1_set_prefix;
-+              EVP_PKEY_new_mac_key;
-+              BIO_new_CMS;
-+              CRYPTO_THREADID_cmp;
-+              TS_REQ_ext_free;
-+              EVP_PKEY_asn1_set_free;
-+              EVP_PKEY_get0_asn1;
-+              d2i_NETSCAPE_X509;
-+              EVP_PKEY_verify_recover_init;
-+              EVP_PKEY_CTX_set_data;
-+              EVP_PKEY_keygen_init;
-+              TS_RESP_CTX_set_status_info;
-+              TS_MSG_IMPRINT_get_algo;
-+              TS_REQ_print_bio;
-+              EVP_PKEY_CTX_ctrl_str;
-+              EVP_PKEY_get_default_digest_nid;
-+              PEM_write_bio_PKCS7_stream;
-+              TS_MSG_IMPRINT_print_bio;
-+              BN_asc2bn;
-+              TS_REQ_get_policy_id;
-+              ENGINE_set_default_pkey_asn1_meths;
-+              ENGINE_set_def_pkey_asn1_meths;
-+              d2i_TS_ACCURACY;
-+              DSO_global_lookup;
-+              TS_CONF_set_tsa_name;
-+              i2d_ASN1_SET_ANY;
-+              ENGINE_load_gost;
-+              WHIRLPOOL_BitUpdate;
-+              ASN1_PCTX_get_flags;
-+              TS_TST_INFO_get_ext_by_NID;
-+              TS_RESP_new;
-+              ESS_CERT_ID_dup;
-+              TS_STATUS_INFO_dup;
-+              TS_REQ_delete_ext;
-+              EVP_DigestVerifyFinal;
-+              EVP_PKEY_print_params;
-+              i2d_CMS_bio_stream;
-+              TS_REQ_get_msg_imprint;
-+              OBJ_find_sigid_by_algs;
-+              TS_TST_INFO_get_serial;
-+              TS_REQ_get_nonce;
-+              X509_PUBKEY_set0_param;
-+              EVP_PKEY_CTX_set0_keygen_info;
-+              DIST_POINT_set_dpname;
-+              i2d_ISSUING_DIST_POINT;
-+              ASN1_SET_ANY_it;
-+              EVP_PKEY_CTX_get_data;
-+              TS_STATUS_INFO_print_bio;
-+              EVP_PKEY_derive_init;
-+              d2i_TS_TST_INFO;
-+              EVP_PKEY_asn1_add_alias;
-+              d2i_TS_RESP_bio;
-+              OTHERNAME_cmp;
-+              GENERAL_NAME_set0_value;
-+              PKCS7_RECIP_INFO_get0_alg;
-+              TS_RESP_CTX_new;
-+              TS_RESP_set_tst_info;
-+              PKCS7_final;
-+              EVP_PKEY_base_id;
-+              TS_RESP_CTX_set_signer_cert;
-+              TS_REQ_set_msg_imprint;
-+              EVP_PKEY_CTX_ctrl;
-+              TS_CONF_set_digests;
-+              d2i_TS_MSG_IMPRINT;
-+              EVP_PKEY_meth_set_ctrl;
-+              TS_REQ_get_ext_by_NID;
-+              PKCS5_pbe_set0_algor;
-+              BN_BLINDING_thread_id;
-+              TS_ACCURACY_new;
-+              X509_CRL_METHOD_free;
-+              ASN1_PCTX_get_nm_flags;
-+              EVP_PKEY_meth_set_sign;
-+              CRYPTO_THREADID_current;
-+              EVP_PKEY_decrypt_init;
-+              NETSCAPE_X509_free;
-+              i2b_PVK_bio;
-+              EVP_PKEY_print_private;
-+              GENERAL_NAME_get0_value;
-+              b2i_PVK_bio;
-+              ASN1_UTCTIME_adj;
-+              TS_TST_INFO_new;
-+              EVP_MD_do_all_sorted;
-+              TS_CONF_set_default_engine;
-+              TS_ACCURACY_set_seconds;
-+              TS_TST_INFO_get_time;
-+              PKCS8_pkey_get0;
-+              EVP_PKEY_asn1_get0;
-+              OBJ_add_sigid;
-+              PKCS7_SIGNER_INFO_sign;
-+              EVP_PKEY_paramgen_init;
-+              EVP_PKEY_sign;
-+              OBJ_sigid_free;
-+              EVP_PKEY_meth_set_init;
-+              d2i_ESS_ISSUER_SERIAL;
-+              ISSUING_DIST_POINT_new;
-+              ASN1_TIME_adj;
-+              TS_OBJ_print_bio;
-+              EVP_PKEY_meth_set_verify_recover;
-+              EVP_PKEY_meth_set_vrfy_recover;
-+              TS_RESP_get_status_info;
-+              CMS_stream;
-+              EVP_PKEY_CTX_set_cb;
-+              PKCS7_to_TS_TST_INFO;
-+              ASN1_PCTX_get_oid_flags;
-+              TS_TST_INFO_add_ext;
-+              EVP_PKEY_meth_set_derive;
-+              i2d_TS_RESP_fp;
-+              i2d_TS_MSG_IMPRINT_bio;
-+              TS_RESP_CTX_set_accuracy;
-+              TS_REQ_set_nonce;
-+              ESS_CERT_ID_new;
-+              ENGINE_pkey_asn1_find_str;
-+              TS_REQ_get_ext_count;
-+              BUF_reverse;
-+              TS_TST_INFO_print_bio;
-+              d2i_ISSUING_DIST_POINT;
-+              ENGINE_get_pkey_meths;
-+              i2b_PrivateKey_bio;
-+              i2d_TS_RESP;
-+              b2i_PublicKey;
-+              TS_VERIFY_CTX_cleanup;
-+              TS_STATUS_INFO_free;
-+              TS_RESP_verify_token;
-+              OBJ_bsearch_ex_;
-+              ASN1_bn_print;
-+              EVP_PKEY_asn1_get_count;
-+              ENGINE_register_pkey_asn1_meths;
-+              ASN1_PCTX_set_nm_flags;
-+              EVP_DigestVerifyInit;
-+              ENGINE_set_default_pkey_meths;
-+              TS_TST_INFO_get_policy_id;
-+              TS_REQ_get_cert_req;
-+              X509_CRL_set_meth_data;
-+              PKCS8_pkey_set0;
-+              ASN1_STRING_copy;
-+              d2i_TS_TST_INFO_fp;
-+              X509_CRL_match;
-+              EVP_PKEY_asn1_set_private;
-+              TS_TST_INFO_get_ext_d2i;
-+              TS_RESP_CTX_add_policy;
-+              d2i_TS_RESP;
-+              TS_CONF_load_certs;
-+              TS_TST_INFO_get_msg_imprint;
-+              ERR_load_TS_strings;
-+              TS_TST_INFO_get_version;
-+              EVP_PKEY_CTX_dup;
-+              EVP_PKEY_meth_set_verify;
-+              i2b_PublicKey_bio;
-+              TS_CONF_set_certs;
-+              EVP_PKEY_asn1_get0_info;
-+              TS_VERIFY_CTX_free;
-+              TS_REQ_get_ext_by_critical;
-+              TS_RESP_CTX_set_serial_cb;
-+              X509_CRL_get_meth_data;
-+              TS_RESP_CTX_set_time_cb;
-+              TS_MSG_IMPRINT_get_msg;
-+              TS_TST_INFO_ext_free;
-+              TS_REQ_get_version;
-+              TS_REQ_add_ext;
-+              EVP_PKEY_CTX_set_app_data;
-+              OBJ_bsearch_;
-+              EVP_PKEY_meth_set_verifyctx;
-+              i2d_PKCS7_bio_stream;
-+              CRYPTO_THREADID_set_numeric;
-+              PKCS7_sign_add_signer;
-+              d2i_TS_TST_INFO_bio;
-+              TS_TST_INFO_get_ordering;
-+              TS_RESP_print_bio;
-+              TS_TST_INFO_get_exts;
-+              HMAC_CTX_copy;
-+              PKCS5_pbe2_set_iv;
-+              ENGINE_get_pkey_asn1_meths;
-+              b2i_PrivateKey;
-+              EVP_PKEY_CTX_get_app_data;
-+              TS_REQ_set_cert_req;
-+              CRYPTO_THREADID_set_callback;
-+              TS_CONF_set_serial;
-+              TS_TST_INFO_free;
-+              d2i_TS_REQ_fp;
-+              TS_RESP_verify_response;
-+              i2d_ESS_ISSUER_SERIAL;
-+              TS_ACCURACY_get_seconds;
-+              EVP_CIPHER_do_all;
-+              b2i_PrivateKey_bio;
-+              OCSP_CERTID_dup;
-+              X509_PUBKEY_get0_param;
-+              TS_MSG_IMPRINT_dup;
-+              PKCS7_print_ctx;
-+              i2d_TS_REQ_bio;
-+              EVP_whirlpool;
-+              EVP_PKEY_asn1_set_param;
-+              EVP_PKEY_meth_set_encrypt;
-+              ASN1_PCTX_set_flags;
-+              i2d_ESS_CERT_ID;
-+              TS_VERIFY_CTX_new;
-+              TS_RESP_CTX_set_extension_cb;
-+              ENGINE_register_all_pkey_meths;
-+              TS_RESP_CTX_set_status_info_cond;
-+              TS_RESP_CTX_set_stat_info_cond;
-+              EVP_PKEY_verify;
-+              WHIRLPOOL_Final;
-+              X509_CRL_METHOD_new;
-+              EVP_DigestSignFinal;
-+              TS_RESP_CTX_set_def_policy;
-+              NETSCAPE_X509_it;
-+              TS_RESP_create_response;
-+              PKCS7_SIGNER_INFO_get0_algs;
-+              TS_TST_INFO_get_nonce;
-+              EVP_PKEY_decrypt_old;
-+              TS_TST_INFO_set_policy_id;
-+              TS_CONF_set_ess_cert_id_chain;
-+              EVP_PKEY_CTX_get0_pkey;
-+              d2i_TS_REQ;
-+              EVP_PKEY_asn1_find_str;
-+              BIO_f_asn1;
-+              ESS_SIGNING_CERT_new;
-+              EVP_PBE_find;
-+              X509_CRL_get0_by_cert;
-+              EVP_PKEY_derive;
-+              i2d_TS_REQ;
-+              TS_TST_INFO_delete_ext;
-+              ESS_ISSUER_SERIAL_free;
-+              ASN1_PCTX_set_str_flags;
-+              ENGINE_get_pkey_asn1_meth_str;
-+              TS_CONF_set_signer_key;
-+              TS_ACCURACY_get_millis;
-+              TS_RESP_get_token;
-+              TS_ACCURACY_dup;
-+              ENGINE_register_all_pkey_asn1_meths;
-+              ENGINE_reg_all_pkey_asn1_meths;
-+              X509_CRL_set_default_method;
-+              CRYPTO_THREADID_hash;
-+              CMS_ContentInfo_print_ctx;
-+              TS_RESP_free;
-+              ISSUING_DIST_POINT_free;
-+              ESS_ISSUER_SERIAL_new;
-+              CMS_add1_crl;
-+              PKCS7_add1_attrib_digest;
-+              TS_RESP_CTX_add_md;
-+              TS_TST_INFO_dup;
-+              ENGINE_set_pkey_asn1_meths;
-+              PEM_write_bio_Parameters;
-+              TS_TST_INFO_get_accuracy;
-+              X509_CRL_get0_by_serial;
-+              TS_TST_INFO_set_version;
-+              TS_RESP_CTX_get_tst_info;
-+              TS_RESP_verify_signature;
-+              CRYPTO_THREADID_get_callback;
-+              TS_TST_INFO_get_tsa;
-+              TS_STATUS_INFO_new;
-+              EVP_PKEY_CTX_get_cb;
-+              TS_REQ_get_ext_d2i;
-+              GENERAL_NAME_set0_othername;
-+              TS_TST_INFO_get_ext_count;
-+              TS_RESP_CTX_get_request;
-+              i2d_NETSCAPE_X509;
-+              ENGINE_get_pkey_meth_engine;
-+              EVP_PKEY_meth_set_signctx;
-+              EVP_PKEY_asn1_copy;
-+              ASN1_TYPE_cmp;
-+              EVP_CIPHER_do_all_sorted;
-+              EVP_PKEY_CTX_free;
-+              ISSUING_DIST_POINT_it;
-+              d2i_TS_MSG_IMPRINT_fp;
-+              X509_STORE_get1_certs;
-+              EVP_PKEY_CTX_get_operation;
-+              d2i_ESS_SIGNING_CERT;
-+              TS_CONF_set_ordering;
-+              EVP_PBE_alg_add_type;
-+              TS_REQ_set_version;
-+              EVP_PKEY_get0;
-+              BIO_asn1_set_suffix;
-+              i2d_TS_STATUS_INFO;
-+              EVP_MD_do_all;
-+              TS_TST_INFO_set_accuracy;
-+              PKCS7_add_attrib_content_type;
-+              ERR_remove_thread_state;
-+              EVP_PKEY_meth_add0;
-+              TS_TST_INFO_set_tsa;
-+              EVP_PKEY_meth_new;
-+              WHIRLPOOL_Update;
-+              TS_CONF_set_accuracy;
-+              ASN1_PCTX_set_oid_flags;
-+              ESS_SIGNING_CERT_dup;
-+              d2i_TS_REQ_bio;
-+              X509_time_adj_ex;
-+              TS_RESP_CTX_add_flags;
-+              d2i_TS_STATUS_INFO;
-+              TS_MSG_IMPRINT_set_msg;
-+              BIO_asn1_get_suffix;
-+              TS_REQ_free;
-+              EVP_PKEY_meth_free;
-+              TS_REQ_get_exts;
-+              TS_RESP_CTX_set_clock_precision_digits;
-+              TS_RESP_CTX_set_clk_prec_digits;
-+              TS_RESP_CTX_add_failure_info;
-+              i2d_TS_RESP_bio;
-+              EVP_PKEY_CTX_get0_peerkey;
-+              PEM_write_bio_CMS_stream;
-+              TS_REQ_new;
-+              TS_MSG_IMPRINT_new;
-+              EVP_PKEY_meth_find;
-+              EVP_PKEY_id;
-+              TS_TST_INFO_set_serial;
-+              a2i_GENERAL_NAME;
-+              TS_CONF_set_crypto_device;
-+              EVP_PKEY_verify_init;
-+              TS_CONF_set_policies;
-+              ASN1_PCTX_new;
-+              ESS_CERT_ID_free;
-+              ENGINE_unregister_pkey_meths;
-+              TS_MSG_IMPRINT_free;
-+              TS_VERIFY_CTX_init;
-+              PKCS7_stream;
-+              TS_RESP_CTX_set_certs;
-+              TS_CONF_set_def_policy;
-+              ASN1_GENERALIZEDTIME_adj;
-+              NETSCAPE_X509_new;
-+              TS_ACCURACY_free;
-+              TS_RESP_get_tst_info;
-+              EVP_PKEY_derive_set_peer;
-+              PEM_read_bio_Parameters;
-+              TS_CONF_set_clock_precision_digits;
-+              TS_CONF_set_clk_prec_digits;
-+              ESS_ISSUER_SERIAL_dup;
-+              TS_ACCURACY_get_micros;
-+              ASN1_PCTX_get_str_flags;
-+              NAME_CONSTRAINTS_check;
-+              ASN1_BIT_STRING_check;
-+              X509_check_akid;
-+              ENGINE_unregister_pkey_asn1_meths;
-+              ENGINE_unreg_pkey_asn1_meths;
-+              ASN1_PCTX_free;
-+              PEM_write_bio_ASN1_stream;
-+              i2d_ASN1_bio_stream;
-+              TS_X509_ALGOR_print_bio;
-+              EVP_PKEY_meth_set_cleanup;
-+              EVP_PKEY_asn1_free;
-+              ESS_SIGNING_CERT_free;
-+              TS_TST_INFO_set_msg_imprint;
-+              GENERAL_NAME_cmp;
-+              d2i_ASN1_SET_ANY;
-+              ENGINE_set_pkey_meths;
-+              i2d_TS_REQ_fp;
-+              d2i_ASN1_SEQUENCE_ANY;
-+              GENERAL_NAME_get0_otherName;
-+              d2i_ESS_CERT_ID;
-+              OBJ_find_sigid_algs;
-+              EVP_PKEY_meth_set_keygen;
-+              PKCS5_PBKDF2_HMAC;
-+              EVP_PKEY_paramgen;
-+              EVP_PKEY_meth_set_paramgen;
-+              BIO_new_PKCS7;
-+              EVP_PKEY_verify_recover;
-+              TS_ext_print_bio;
-+              TS_ASN1_INTEGER_print_bio;
-+              check_defer;
-+              DSO_pathbyaddr;
-+              EVP_PKEY_set_type;
-+              TS_ACCURACY_set_micros;
-+              TS_REQ_to_TS_VERIFY_CTX;
-+              EVP_PKEY_meth_set_copy;
-+              ASN1_PCTX_set_cert_flags;
-+              TS_TST_INFO_get_ext;
-+              EVP_PKEY_asn1_set_ctrl;
-+              TS_TST_INFO_get_ext_by_critical;
-+              EVP_PKEY_CTX_new_id;
-+              TS_REQ_get_ext_by_OBJ;
-+              TS_CONF_set_signer_cert;
-+              X509_NAME_hash_old;
-+              ASN1_TIME_set_string;
-+              EVP_MD_flags;
-+              TS_RESP_CTX_free;
-+              DSAparams_dup;
-+              DHparams_dup;
-+              OCSP_REQ_CTX_add1_header;
-+              OCSP_REQ_CTX_set1_req;
-+              X509_STORE_set_verify_cb;
-+              X509_STORE_CTX_get0_current_crl;
-+              X509_STORE_CTX_get0_parent_ctx;
-+              X509_STORE_CTX_get0_current_issuer;
-+              X509_STORE_CTX_get0_cur_issuer;
-+              X509_issuer_name_hash_old;
-+              X509_subject_name_hash_old;
-+              EVP_CIPHER_CTX_copy;
-+              UI_method_get_prompt_constructor;
-+              UI_method_get_prompt_constructr;
-+              UI_method_set_prompt_constructor;
-+              UI_method_set_prompt_constructr;
-+              EVP_read_pw_string_min;
-+              CRYPTO_cts128_encrypt;
-+              CRYPTO_cts128_decrypt_block;
-+              CRYPTO_cfb128_1_encrypt;
-+              CRYPTO_cbc128_encrypt;
-+              CRYPTO_ctr128_encrypt;
-+              CRYPTO_ofb128_encrypt;
-+              CRYPTO_cts128_decrypt;
-+              CRYPTO_cts128_encrypt_block;
-+              CRYPTO_cbc128_decrypt;
-+              CRYPTO_cfb128_encrypt;
-+              CRYPTO_cfb128_8_encrypt;
-+              SSL_renegotiate_abbreviated;
-+              TLSv1_1_method;
-+              TLSv1_1_client_method;
-+              TLSv1_1_server_method;
-+              SSL_CTX_set_srp_client_pwd_callback;
-+              SSL_CTX_set_srp_client_pwd_cb;
-+              SSL_get_srp_g;
-+              SSL_CTX_set_srp_username_callback;
-+              SSL_CTX_set_srp_un_cb;
-+              SSL_get_srp_userinfo;
-+              SSL_set_srp_server_param;
-+              SSL_set_srp_server_param_pw;
-+              SSL_get_srp_N;
-+              SSL_get_srp_username;
-+              SSL_CTX_set_srp_password;
-+              SSL_CTX_set_srp_strength;
-+              SSL_CTX_set_srp_verify_param_callback;
-+              SSL_CTX_set_srp_vfy_param_cb;
-+              SSL_CTX_set_srp_cb_arg;
-+              SSL_CTX_set_srp_username;
-+              SSL_CTX_SRP_CTX_init;
-+              SSL_SRP_CTX_init;
-+              SRP_Calc_A_param;
-+              SRP_generate_server_master_secret;
-+              SRP_gen_server_master_secret;
-+              SSL_CTX_SRP_CTX_free;
-+              SRP_generate_client_master_secret;
-+              SRP_gen_client_master_secret;
-+              SSL_srp_server_param_with_username;
-+              SSL_srp_server_param_with_un;
-+              SSL_SRP_CTX_free;
-+              SSL_set_debug;
-+              SSL_SESSION_get0_peer;
-+              TLSv1_2_client_method;
-+              SSL_SESSION_set1_id_context;
-+              TLSv1_2_server_method;
-+              SSL_cache_hit;
-+              SSL_get0_kssl_ctx;
-+              SSL_set0_kssl_ctx;
-+              SSL_set_state;
-+              SSL_CIPHER_get_id;
-+              TLSv1_2_method;
-+              kssl_ctx_get0_client_princ;
-+              SSL_export_keying_material;
-+              SSL_set_tlsext_use_srtp;
-+              SSL_CTX_set_next_protos_advertised_cb;
-+              SSL_CTX_set_next_protos_adv_cb;
-+              SSL_get0_next_proto_negotiated;
-+              SSL_get_selected_srtp_profile;
-+              SSL_CTX_set_tlsext_use_srtp;
-+              SSL_select_next_proto;
-+              SSL_get_srtp_profiles;
-+              SSL_CTX_set_next_proto_select_cb;
-+              SSL_CTX_set_next_proto_sel_cb;
-+              SSL_SESSION_get_compress_id;
-+
-+              SRP_VBASE_get_by_user;
-+              SRP_Calc_server_key;
-+              SRP_create_verifier;
-+              SRP_create_verifier_BN;
-+              SRP_Calc_u;
-+              SRP_VBASE_free;
-+              SRP_Calc_client_key;
-+              SRP_get_default_gN;
-+              SRP_Calc_x;
-+              SRP_Calc_B;
-+              SRP_VBASE_new;
-+              SRP_check_known_gN_param;
-+              SRP_Calc_A;
-+              SRP_Verify_A_mod_N;
-+              SRP_VBASE_init;
-+              SRP_Verify_B_mod_N;
-+              EC_KEY_set_public_key_affine_coordinates;
-+              EC_KEY_set_pub_key_aff_coords;
-+              EVP_aes_192_ctr;
-+              EVP_PKEY_meth_get0_info;
-+              EVP_PKEY_meth_copy;
-+              ERR_add_error_vdata;
-+              EVP_aes_128_ctr;
-+              EVP_aes_256_ctr;
-+              EC_GFp_nistp224_method;
-+              EC_KEY_get_flags;
-+              RSA_padding_add_PKCS1_PSS_mgf1;
-+              EVP_aes_128_xts;
-+              EVP_aes_256_xts;
-+              EVP_aes_128_gcm;
-+              EC_KEY_clear_flags;
-+              EC_KEY_set_flags;
-+              EVP_aes_256_ccm;
-+              RSA_verify_PKCS1_PSS_mgf1;
-+              EVP_aes_128_ccm;
-+              EVP_aes_192_gcm;
-+              X509_ALGOR_set_md;
-+              RAND_init_fips;
-+              EVP_aes_256_gcm;
-+              EVP_aes_192_ccm;
-+              CMAC_CTX_copy;
-+              CMAC_CTX_free;
-+              CMAC_CTX_get0_cipher_ctx;
-+              CMAC_CTX_cleanup;
-+              CMAC_Init;
-+              CMAC_Update;
-+              CMAC_resume;
-+              CMAC_CTX_new;
-+              CMAC_Final;
-+              CRYPTO_ctr128_encrypt_ctr32;
-+              CRYPTO_gcm128_release;
-+              CRYPTO_ccm128_decrypt_ccm64;
-+              CRYPTO_ccm128_encrypt;
-+              CRYPTO_gcm128_encrypt;
-+              CRYPTO_xts128_encrypt;
-+              EVP_rc4_hmac_md5;
-+              CRYPTO_nistcts128_decrypt_block;
-+              CRYPTO_gcm128_setiv;
-+              CRYPTO_nistcts128_encrypt;
-+              EVP_aes_128_cbc_hmac_sha1;
-+              CRYPTO_gcm128_tag;
-+              CRYPTO_ccm128_encrypt_ccm64;
-+              ENGINE_load_rdrand;
-+              CRYPTO_ccm128_setiv;
-+              CRYPTO_nistcts128_encrypt_block;
-+              CRYPTO_gcm128_aad;
-+              CRYPTO_ccm128_init;
-+              CRYPTO_nistcts128_decrypt;
-+              CRYPTO_gcm128_new;
-+              CRYPTO_ccm128_tag;
-+              CRYPTO_ccm128_decrypt;
-+              CRYPTO_ccm128_aad;
-+              CRYPTO_gcm128_init;
-+              CRYPTO_gcm128_decrypt;
-+              ENGINE_load_rsax;
-+              CRYPTO_gcm128_decrypt_ctr32;
-+              CRYPTO_gcm128_encrypt_ctr32;
-+              CRYPTO_gcm128_finish;
-+              EVP_aes_256_cbc_hmac_sha1;
-+              PKCS5_pbkdf2_set;
-+              CMS_add0_recipient_password;
-+              CMS_decrypt_set1_password;
-+              CMS_RecipientInfo_set0_password;
-+              RAND_set_fips_drbg_type;
-+              X509_REQ_sign_ctx;
-+              RSA_PSS_PARAMS_new;
-+              X509_CRL_sign_ctx;
-+              X509_signature_dump;
-+              d2i_RSA_PSS_PARAMS;
-+              RSA_PSS_PARAMS_it;
-+              RSA_PSS_PARAMS_free;
-+              X509_sign_ctx;
-+              i2d_RSA_PSS_PARAMS;
-+              ASN1_item_sign_ctx;
-+              EC_GFp_nistp521_method;
-+              EC_GFp_nistp256_method;
-+              OPENSSL_stderr;
-+              OPENSSL_cpuid_setup;
-+              OPENSSL_showfatal;
-+              BIO_new_dgram_sctp;
-+              BIO_dgram_sctp_msg_waiting;
-+              BIO_dgram_sctp_wait_for_dry;
-+              BIO_s_datagram_sctp;
-+              BIO_dgram_is_sctp;
-+              BIO_dgram_sctp_notification_cb;
-+              CRYPTO_memcmp;
-+              SSL_CTX_set_alpn_protos;
-+              SSL_set_alpn_protos;
-+              SSL_CTX_set_alpn_select_cb;
-+              SSL_get0_alpn_selected;
-+              SSL_CTX_set_custom_cli_ext;
-+              SSL_CTX_set_custom_srv_ext;
-+              SSL_CTX_set_srv_supp_data;
-+              SSL_CTX_set_cli_supp_data;
-+              SSL_set_cert_cb;
-+              SSL_CTX_use_serverinfo;
-+              SSL_CTX_use_serverinfo_file;
-+              SSL_CTX_set_cert_cb;
-+              SSL_CTX_get0_param;
-+              SSL_get0_param;
-+              SSL_certs_clear;
-+              DTLSv1_2_method;
-+              DTLSv1_2_server_method;
-+              DTLSv1_2_client_method;
-+              DTLS_method;
-+              DTLS_server_method;
-+              DTLS_client_method;
-+              SSL_CTX_get_ssl_method;
-+              SSL_CTX_get0_certificate;
-+              SSL_CTX_get0_privatekey;
-+              SSL_COMP_set0_compression_methods;
-+              SSL_COMP_free_compression_methods;
-+              SSL_CIPHER_find;
-+              SSL_is_server;
-+              SSL_CONF_CTX_new;
-+              SSL_CONF_CTX_finish;
-+              SSL_CONF_CTX_free;
-+              SSL_CONF_CTX_set_flags;
-+              SSL_CONF_CTX_clear_flags;
-+              SSL_CONF_CTX_set1_prefix;
-+              SSL_CONF_CTX_set_ssl;
-+              SSL_CONF_CTX_set_ssl_ctx;
-+              SSL_CONF_cmd;
-+              SSL_CONF_cmd_argv;
-+              SSL_CONF_cmd_value_type;
-+              SSL_trace;
-+              SSL_CIPHER_standard_name;
-+              SSL_get_tlsa_record_byname;
-+              ASN1_TIME_diff;
-+              BIO_hex_string;
-+              CMS_RecipientInfo_get0_pkey_ctx;
-+              CMS_RecipientInfo_encrypt;
-+              CMS_SignerInfo_get0_pkey_ctx;
-+              CMS_SignerInfo_get0_md_ctx;
-+              CMS_SignerInfo_get0_signature;
-+              CMS_RecipientInfo_kari_get0_alg;
-+              CMS_RecipientInfo_kari_get0_reks;
-+              CMS_RecipientInfo_kari_get0_orig_id;
-+              CMS_RecipientInfo_kari_orig_id_cmp;
-+              CMS_RecipientEncryptedKey_get0_id;
-+              CMS_RecipientEncryptedKey_cert_cmp;
-+              CMS_RecipientInfo_kari_set0_pkey;
-+              CMS_RecipientInfo_kari_get0_ctx;
-+              CMS_RecipientInfo_kari_decrypt;
-+              CMS_SharedInfo_encode;
-+              DH_compute_key_padded;
-+              d2i_DHxparams;
-+              i2d_DHxparams;
-+              DH_get_1024_160;
-+              DH_get_2048_224;
-+              DH_get_2048_256;
-+              DH_KDF_X9_42;
-+              ECDH_KDF_X9_62;
-+              ECDSA_METHOD_new;
-+              ECDSA_METHOD_free;
-+              ECDSA_METHOD_set_app_data;
-+              ECDSA_METHOD_get_app_data;
-+              ECDSA_METHOD_set_sign;
-+              ECDSA_METHOD_set_sign_setup;
-+              ECDSA_METHOD_set_verify;
-+              ECDSA_METHOD_set_flags;
-+              ECDSA_METHOD_set_name;
-+              EVP_des_ede3_wrap;
-+              EVP_aes_128_wrap;
-+              EVP_aes_192_wrap;
-+              EVP_aes_256_wrap;
-+              EVP_aes_128_cbc_hmac_sha256;
-+              EVP_aes_256_cbc_hmac_sha256;
-+              CRYPTO_128_wrap;
-+              CRYPTO_128_unwrap;
-+              OCSP_REQ_CTX_nbio;
-+              OCSP_REQ_CTX_new;
-+              OCSP_set_max_response_length;
-+              OCSP_REQ_CTX_i2d;
-+              OCSP_REQ_CTX_nbio_d2i;
-+              OCSP_REQ_CTX_get0_mem_bio;
-+              OCSP_REQ_CTX_http;
-+              RSA_padding_add_PKCS1_OAEP_mgf1;
-+              RSA_padding_check_PKCS1_OAEP_mgf1;
-+              RSA_OAEP_PARAMS_free;
-+              RSA_OAEP_PARAMS_it;
-+              RSA_OAEP_PARAMS_new;
-+              SSL_get_sigalgs;
-+              SSL_get_shared_sigalgs;
-+              SSL_check_chain;
-+              X509_chain_up_ref;
-+              X509_http_nbio;
-+              X509_CRL_http_nbio;
-+              X509_REVOKED_dup;
-+              i2d_re_X509_tbs;
-+              X509_get0_signature;
-+              X509_get_signature_nid;
-+              X509_CRL_diff;
-+              X509_chain_check_suiteb;
-+              X509_CRL_check_suiteb;
-+              X509_check_host;
-+              X509_check_email;
-+              X509_check_ip;
-+              X509_check_ip_asc;
-+              X509_STORE_set_lookup_crls_cb;
-+              X509_STORE_CTX_get0_store;
-+              X509_VERIFY_PARAM_set1_host;
-+              X509_VERIFY_PARAM_add1_host;
-+              X509_VERIFY_PARAM_set_hostflags;
-+              X509_VERIFY_PARAM_get0_peername;
-+              X509_VERIFY_PARAM_set1_email;
-+              X509_VERIFY_PARAM_set1_ip;
-+              X509_VERIFY_PARAM_set1_ip_asc;
-+              X509_VERIFY_PARAM_get0_name;
-+              X509_VERIFY_PARAM_get_count;
-+              X509_VERIFY_PARAM_get0;
-+              X509V3_EXT_free;
-+              EC_GROUP_get_mont_data;
-+              EC_curve_nid2nist;
-+              EC_curve_nist2nid;
-+              PEM_write_bio_DHxparams;
-+              PEM_write_DHxparams;
-+              SSL_CTX_add_client_custom_ext;
-+              SSL_CTX_add_server_custom_ext;
-+              SSL_extension_supported;
-+              BUF_strnlen;
-+              sk_deep_copy;
-+              SSL_test_functions;
-+
-+      local:
-+              *;
-+};
-+
-+OPENSSL_1.0.2g {
-+       global:
-+               SRP_VBASE_get1_by_user;
-+               SRP_user_pwd_free;
-+} OPENSSL_1.0.2d;
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.2 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
-Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld  2014-02-24 21:02:30.000000000 +0100
-@@ -0,0 +1,10 @@
-+OPENSSL_1.0.2 {
-+      global:
-+              bind_engine;
-+              v_check;
-+              OPENSSL_init;
-+              OPENSSL_finish;
-+      local:
-+              *;
-+};
-+
index 2a318a45849aba7bbc253e3f4aee6e67fd522fed..06d1ea69d37cb2414e06c61256b8cf588998a290 100644 (file)
@@ -4,7 +4,7 @@ This patch adds the fix for one of the ciphers used in openssl, namely
 the cipher des-ede3-cfb1. Complete bug log and patch is present here:
 http://rt.openssl.org/Ticket/Display.html?id=2867
 
-Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
+Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com>
 
 Index: openssl-1.0.2/crypto/evp/e_des3.c
 ===================================================================
diff --git a/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
deleted file mode 100644 (file)
index f736e5c..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
-
-We should avoid accessing the type pointer if it's NULL,
-this could happen if ctx->digest is not NULL.
-
-Upstream-Status: Submitted
-http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html
-
-Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
----
-Index: openssl-1.0.2h/crypto/evp/digest.c
-===================================================================
---- openssl-1.0.2h.orig/crypto/evp/digest.c
-+++ openssl-1.0.2h/crypto/evp/digest.c
-@@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c
-         type = ctx->digest;
-     }
- #endif
--    if (ctx->digest != type) {
-+    if (type && (ctx->digest != type)) {
-         if (ctx->digest && ctx->digest->ctx_size) {
-             OPENSSL_free(ctx->md_data);
-             ctx->md_data = NULL;
diff --git a/recipes-connectivity/openssl/openssl-qoriq/openssl-c_rehash.sh b/recipes-connectivity/openssl/openssl-qoriq/openssl-c_rehash.sh
deleted file mode 100644 (file)
index f67f415..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/sh
-#
-# Ben Secrest <blsecres@gmail.com>
-#
-# sh c_rehash script, scan all files in a directory
-# and add symbolic links to their hash values.
-#
-# based on the c_rehash perl script distributed with openssl
-#
-# LICENSE: See OpenSSL license
-# ^^acceptable?^^
-#
-
-# default certificate location
-DIR=/etc/openssl
-
-# for filetype bitfield
-IS_CERT=$(( 1 << 0 ))
-IS_CRL=$(( 1 << 1 ))
-
-
-# check to see if a file is a certificate file or a CRL file
-# arguments:
-#       1. the filename to be scanned
-# returns:
-#       bitfield of file type; uses ${IS_CERT} and ${IS_CRL}
-#
-check_file()
-{
-    local IS_TYPE=0
-
-    # make IFS a newline so we can process grep output line by line
-    local OLDIFS=${IFS}
-    IFS=$( printf "\n" )
-
-    # XXX: could be more efficient to have two 'grep -m' but is -m portable?
-    for LINE in $( grep '^-----BEGIN .*-----' ${1} )
-    do
-       if echo ${LINE} \
-           | grep -q -E '^-----BEGIN (X509 |TRUSTED )?CERTIFICATE-----'
-       then
-           IS_TYPE=$(( ${IS_TYPE} | ${IS_CERT} ))
-
-           if [ $(( ${IS_TYPE} & ${IS_CRL} )) -ne 0 ]
-           then
-               break
-           fi
-       elif echo ${LINE} | grep -q '^-----BEGIN X509 CRL-----'
-       then
-           IS_TYPE=$(( ${IS_TYPE} | ${IS_CRL} ))
-
-           if [ $(( ${IS_TYPE} & ${IS_CERT} )) -ne 0 ]
-           then
-               break
-           fi
-       fi
-    done
-
-    # restore IFS
-    IFS=${OLDIFS}
-
-    return ${IS_TYPE}
-}
-
-
-#
-# use openssl to fingerprint a file
-#    arguments:
-#      1. the filename to fingerprint
-#      2. the method to use (x509, crl)
-#    returns:
-#      none
-#    assumptions:
-#      user will capture output from last stage of pipeline
-#
-fingerprint()
-{
-    ${SSL_CMD} ${2} -fingerprint -noout -in ${1} | sed 's/^.*=//' | tr -d ':'
-}
-
-
-#
-# link_hash - create links to certificate files
-#    arguments:
-#       1. the filename to create a link for
-#      2. the type of certificate being linked (x509, crl)
-#    returns:
-#      0 on success, 1 otherwise
-#
-link_hash()
-{
-    local FINGERPRINT=$( fingerprint ${1} ${2} )
-    local HASH=$( ${SSL_CMD} ${2} -hash -noout -in ${1} )
-    local SUFFIX=0
-    local LINKFILE=''
-    local TAG=''
-
-    if [ ${2} = "crl" ]
-    then
-       TAG='r'
-    fi
-
-    LINKFILE=${HASH}.${TAG}${SUFFIX}
-
-    while [ -f ${LINKFILE} ]
-    do
-       if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ]
-       then
-           echo "NOTE: Skipping duplicate file ${1}" >&2
-           return 1
-       fi      
-
-       SUFFIX=$(( ${SUFFIX} + 1 ))
-       LINKFILE=${HASH}.${TAG}${SUFFIX}
-    done
-
-    echo "${1} => ${LINKFILE}"
-
-    # assume any system with a POSIX shell will either support symlinks or
-    # do something to handle this gracefully
-    ln -s ${1} ${LINKFILE}
-
-    return 0
-}
-
-
-# hash_dir create hash links in a given directory
-hash_dir()
-{
-    echo "Doing ${1}"
-
-    cd ${1}
-
-    ls -1 * 2>/dev/null | while read FILE
-    do
-        if echo ${FILE} | grep -q -E '^[[:xdigit:]]{8}\.r?[[:digit:]]+$' \
-               && [ -h "${FILE}" ]
-        then
-            rm ${FILE}
-        fi
-    done
-
-    ls -1 *.pem *.cer *.crt *.crl 2>/dev/null | while read FILE
-    do
-       check_file ${FILE}
-        local FILE_TYPE=${?}
-       local TYPE_STR=''
-
-        if [ $(( ${FILE_TYPE} & ${IS_CERT} )) -ne 0 ]
-        then
-            TYPE_STR='x509'
-        elif [ $(( ${FILE_TYPE} & ${IS_CRL} )) -ne 0 ]
-        then
-            TYPE_STR='crl'
-        else
-            echo "NOTE: ${FILE} does not contain a certificate or CRL: skipping" >&2
-           continue
-        fi
-
-       link_hash ${FILE} ${TYPE_STR}
-    done
-}
-
-
-# choose the name of an ssl application
-if [ -n "${OPENSSL}" ]
-then
-    SSL_CMD=$(which ${OPENSSL} 2>/dev/null)
-else
-    SSL_CMD=/usr/bin/openssl
-    OPENSSL=${SSL_CMD}
-    export OPENSSL
-fi
-
-# fix paths
-PATH=${PATH}:${DIR}/bin
-export PATH
-
-# confirm existance/executability of ssl command
-if ! [ -x ${SSL_CMD} ]
-then
-    echo "${0}: rehashing skipped ('openssl' program not available)" >&2
-    exit 0
-fi
-
-# determine which directories to process
-old_IFS=$IFS
-if [ ${#} -gt 0 ]
-then
-    IFS=':'
-    DIRLIST=${*}
-elif [ -n "${SSL_CERT_DIR}" ]
-then
-    DIRLIST=$SSL_CERT_DIR
-else
-    DIRLIST=${DIR}/certs
-fi
-
-IFS=':'
-
-# process directories
-for CERT_DIR in ${DIRLIST}
-do
-    if [ -d ${CERT_DIR} -a -w ${CERT_DIR} ]
-    then
-        IFS=$old_IFS
-        hash_dir ${CERT_DIR}
-        IFS=':'
-    fi
-done
index 0f08a642f61cf9099c43a444de75d8f9a3228699..cbce32c89bc5ec926c2d5cab57e9c9efbc2bd4a0 100644 (file)
@@ -2,10 +2,10 @@ Upstream-Status: Pending
 
 Received from H J Liu @ Intel
 Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
 
 ported the patch to the 1.0.0e version
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
 Index: openssl-1.0.2/crypto/bn/bn.h
 ===================================================================
 --- openssl-1.0.2.orig/crypto/bn/bn.h
diff --git a/recipes-connectivity/openssl/openssl-qoriq/parallel.patch b/recipes-connectivity/openssl/openssl-qoriq/parallel.patch
deleted file mode 100644 (file)
index b6c2c14..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-Fix the parallel races in the Makefiles.
-
-This patch was taken from the Gentoo packaging:
-https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
---- openssl-1.0.2g/crypto/Makefile
-+++ openssl-1.0.2g/crypto/Makefile
-@@ -85,11 +85,11 @@
-       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
- subdirs:
--      @target=all; $(RECURSIVE_MAKE)
-+      +@target=all; $(RECURSIVE_MAKE)
- files:
-       $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
--      @target=files; $(RECURSIVE_MAKE)
-+      +@target=files; $(RECURSIVE_MAKE)
- links:
-       @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib:  $(LIB)
-       @touch lib
--$(LIB):       $(LIBOBJ)
-+$(LIB):       $(LIBOBJ) | subdirs
-       $(AR) $(LIB) $(LIBOBJ)
-       test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
-       $(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
-       fi
- libs:
--      @target=lib; $(RECURSIVE_MAKE)
-+      +@target=lib; $(RECURSIVE_MAKE)
- install:
-       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
--      @target=install; $(RECURSIVE_MAKE)
-+      +@target=install; $(RECURSIVE_MAKE)
- lint:
-       @target=lint; $(RECURSIVE_MAKE)
---- openssl-1.0.2g/engines/Makefile
-+++ openssl-1.0.2g/engines/Makefile
-@@ -72,7 +72,7 @@
- all:  lib subdirs
--lib:  $(LIBOBJ)
-+lib:  $(LIBOBJ) | subdirs
-       @if [ -n "$(SHARED_LIBS)" ]; then \
-               set -e; \
-               for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
- subdirs:
-       echo $(EDIRS)
--      @target=all; $(RECURSIVE_MAKE)
-+      +@target=all; $(RECURSIVE_MAKE)
- files:
-       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
-                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
-               done; \
-       fi
--      @target=install; $(RECURSIVE_MAKE)
-+      +@target=install; $(RECURSIVE_MAKE)
- tags:
-       ctags $(SRC)
---- openssl-1.0.2g/Makefile.org
-+++ openssl-1.0.2g/Makefile.org
-@@ -279,17 +279,17 @@
- build_libssl: build_ssl libssl.pc
- build_crypto:
--      @dir=crypto; target=all; $(BUILD_ONE_CMD)
-+      +@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
--      @dir=ssl; target=all; $(BUILD_ONE_CMD)
-+      +@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
--      @dir=engines; target=all; $(BUILD_ONE_CMD)
-+      +@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
--      @dir=apps; target=all; $(BUILD_ONE_CMD)
-+      +@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
--      @dir=test; target=all; $(BUILD_ONE_CMD)
-+      +@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
--      @dir=tools; target=all; $(BUILD_ONE_CMD)
-+      +@dir=tools; target=all; $(BUILD_ONE_CMD)
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -544,7 +544,7 @@
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
--      @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+      +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
-       @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
-       do \
-               if [ -f "$$i" ]; then \
---- openssl-1.0.2g/Makefile.shared
-+++ openssl-1.0.2g/Makefile.shared
-@@ -105,6 +105,7 @@
-     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
-     $${SHAREDCMD} $${SHAREDFLAGS} \
-       -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
-                       done; \
-               fi; \
-               if [ -n "$$SHLIB_SOVER" ]; then \
-+                      [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
-                       ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
-                         ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
-               fi; \
---- openssl-1.0.2g/test/Makefile
-+++ openssl-1.0.2g/test/Makefile
-@@ -139,7 +139,7 @@
- tags:
-       ctags $(SRC)
--tests:        exe apps $(TESTS)
-+tests:        exe $(TESTS)
- apps:
-       @(cd ..; $(MAKE) DIRS=apps all)
-@@ -421,130 +421,130 @@
-               link_app.$${shlib_target}
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
--      @target=$(RSATEST); $(BUILD_CMD)
-+      +@target=$(RSATEST); $(BUILD_CMD)
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
--      @target=$(BNTEST); $(BUILD_CMD)
-+      +@target=$(BNTEST); $(BUILD_CMD)
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
--      @target=$(ECTEST); $(BUILD_CMD)
-+      +@target=$(ECTEST); $(BUILD_CMD)
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
--      @target=$(EXPTEST); $(BUILD_CMD)
-+      +@target=$(EXPTEST); $(BUILD_CMD)
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
--      @target=$(IDEATEST); $(BUILD_CMD)
-+      +@target=$(IDEATEST); $(BUILD_CMD)
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
--      @target=$(MD2TEST); $(BUILD_CMD)
-+      +@target=$(MD2TEST); $(BUILD_CMD)
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
--      @target=$(SHATEST); $(BUILD_CMD)
-+      +@target=$(SHATEST); $(BUILD_CMD)
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
--      @target=$(SHA1TEST); $(BUILD_CMD)
-+      +@target=$(SHA1TEST); $(BUILD_CMD)
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
--      @target=$(SHA256TEST); $(BUILD_CMD)
-+      +@target=$(SHA256TEST); $(BUILD_CMD)
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
--      @target=$(SHA512TEST); $(BUILD_CMD)
-+      +@target=$(SHA512TEST); $(BUILD_CMD)
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
--      @target=$(RMDTEST); $(BUILD_CMD)
-+      +@target=$(RMDTEST); $(BUILD_CMD)
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
--      @target=$(MDC2TEST); $(BUILD_CMD)
-+      +@target=$(MDC2TEST); $(BUILD_CMD)
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
--      @target=$(MD4TEST); $(BUILD_CMD)
-+      +@target=$(MD4TEST); $(BUILD_CMD)
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
--      @target=$(MD5TEST); $(BUILD_CMD)
-+      +@target=$(MD5TEST); $(BUILD_CMD)
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
--      @target=$(HMACTEST); $(BUILD_CMD)
-+      +@target=$(HMACTEST); $(BUILD_CMD)
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
--      @target=$(WPTEST); $(BUILD_CMD)
-+      +@target=$(WPTEST); $(BUILD_CMD)
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
--      @target=$(RC2TEST); $(BUILD_CMD)
-+      +@target=$(RC2TEST); $(BUILD_CMD)
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
--      @target=$(BFTEST); $(BUILD_CMD)
-+      +@target=$(BFTEST); $(BUILD_CMD)
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
--      @target=$(CASTTEST); $(BUILD_CMD)
-+      +@target=$(CASTTEST); $(BUILD_CMD)
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
--      @target=$(RC4TEST); $(BUILD_CMD)
-+      +@target=$(RC4TEST); $(BUILD_CMD)
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
--      @target=$(RC5TEST); $(BUILD_CMD)
-+      +@target=$(RC5TEST); $(BUILD_CMD)
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
--      @target=$(DESTEST); $(BUILD_CMD)
-+      +@target=$(DESTEST); $(BUILD_CMD)
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
--      @target=$(RANDTEST); $(BUILD_CMD)
-+      +@target=$(RANDTEST); $(BUILD_CMD)
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
--      @target=$(DHTEST); $(BUILD_CMD)
-+      +@target=$(DHTEST); $(BUILD_CMD)
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
--      @target=$(DSATEST); $(BUILD_CMD)
-+      +@target=$(DSATEST); $(BUILD_CMD)
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
--      @target=$(METHTEST); $(BUILD_CMD)
-+      +@target=$(METHTEST); $(BUILD_CMD)
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
--      @target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+      +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
--      @target=$(ENGINETEST); $(BUILD_CMD)
-+      +@target=$(ENGINETEST); $(BUILD_CMD)
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
--      @target=$(EVPTEST); $(BUILD_CMD)
-+      +@target=$(EVPTEST); $(BUILD_CMD)
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
--      @target=$(EVPEXTRATEST); $(BUILD_CMD)
-+      +@target=$(EVPEXTRATEST); $(BUILD_CMD)
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
--      @target=$(ECDSATEST); $(BUILD_CMD)
-+      +@target=$(ECDSATEST); $(BUILD_CMD)
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
--      @target=$(ECDHTEST); $(BUILD_CMD)
-+      +@target=$(ECDHTEST); $(BUILD_CMD)
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
--      @target=$(IGETEST); $(BUILD_CMD)
-+      +@target=$(IGETEST); $(BUILD_CMD)
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
--      @target=$(JPAKETEST); $(BUILD_CMD)
-+      +@target=$(JPAKETEST); $(BUILD_CMD)
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
--      @target=$(ASN1TEST); $(BUILD_CMD)
-+      +@target=$(ASN1TEST); $(BUILD_CMD)
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
--      @target=$(SRPTEST); $(BUILD_CMD)
-+      +@target=$(SRPTEST); $(BUILD_CMD)
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
--      @target=$(V3NAMETEST); $(BUILD_CMD)
-+      +@target=$(V3NAMETEST); $(BUILD_CMD)
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
--      @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+      +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
--      @target=$(CONSTTIMETEST) $(BUILD_CMD)
-+      +@target=$(CONSTTIMETEST) $(BUILD_CMD)
- $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
--      @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
-+      +@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
- $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
--      @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
-+      +@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
- $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
--      @target=$(SSLV2CONFTEST) $(BUILD_CMD)
-+      +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
- #$(AESTEST).o: $(AESTEST).c
- #     $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -557,7 +557,7 @@
- #     fi
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
--      @target=dummytest; $(BUILD_CMD)
-+      +@target=dummytest; $(BUILD_CMD)
- # DO NOT DELETE THIS LINE -- make depend depends on it.
\ No newline at end of file
index 5e99d912bc81dea90af8aea89f1df7fa2dd6ab84..67314cd2643d4b1dff303c9d0344c3ebd8a1db56 100644 (file)
@@ -1,4 +1,4 @@
-From 45e4b0835ad965cf9cc813a31df354f1e6d14513 Mon Sep 17 00:00:00 2001
+From 90d5822f09f0b6a0f1d8d2e7189e702a18686ab7 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Tue, 10 Sep 2013 12:46:46 +0300
 Subject: [PATCH 01/48] remove double initialization of cryptodev engine
@@ -13,9 +13,8 @@ Reviewed-on: http://git.am.freescale.net:8181/17222
 ---
  crypto/engine/eng_all.c | 12 ------------
  crypto/engine/engine.h  |  4 ----
- crypto/evp/c_all.c      |  5 -----
  util/libeay.num         |  2 +-
4 files changed, 1 insertion(+), 22 deletions(-)
3 files changed, 1 insertion(+), 17 deletions(-)
 
 diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
 index 48ad0d2..a198c5f 100644
@@ -52,20 +51,6 @@ index bd7b591..020d912 100644
  /* BEGIN ERROR CODES */
  /*
   * The following lines are auto generated by the script mkerr.pl. Any changes
-diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
-index a3ed00d..719e34d 100644
---- a/crypto/evp/c_all.c
-+++ b/crypto/evp/c_all.c
-@@ -82,9 +82,4 @@ void OPENSSL_add_all_algorithms_noconf(void)
-     OPENSSL_cpuid_setup();
-     OpenSSL_add_all_ciphers();
-     OpenSSL_add_all_digests();
--#ifndef OPENSSL_NO_ENGINE
--# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
--    ENGINE_setup_bsd_cryptodev();
--# endif
--#endif
- }
 diff --git a/util/libeay.num b/util/libeay.num
 index 2094ab3..2742cf5 100755
 --- a/util/libeay.num
@@ -80,5 +65,5 @@ index 2094ab3..2742cf5 100755
  EVP_aes_128_cfb8                        3248  EXIST::FUNCTION:AES
  FIPS_corrupt_rsa                        3249  NOEXIST::FUNCTION:
 -- 
-2.7.0
+2.7.3
 
index d5907892801087358845053f14f025d02852baed..a5c0f6dbc314cb549ee25019c59112e07b824b9e 100644 (file)
@@ -1,4 +1,4 @@
-From e7c630f8417b6f4e1bf2466e545ffe04af2eff00 Mon Sep 17 00:00:00 2001
+From 305ab3fd8a8620fd11f7aef7e42170ba205040a9 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 29 Aug 2013 16:51:18 +0300
 Subject: [PATCH 02/48] eng_cryptodev: add support for TLS algorithms offload
@@ -15,10 +15,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 215 insertions(+), 11 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 8fb9c33..4d783d4 100644
+index 2a2b95c..d4da7fb 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -71,6 +71,9 @@ void ENGINE_load_cryptodev(void)
+@@ -72,6 +72,9 @@ void ENGINE_load_cryptodev(void)
  struct dev_crypto_state {
      struct session_op d_sess;
      int d_fd;
@@ -28,7 +28,7 @@ index 8fb9c33..4d783d4 100644
  # ifdef USE_CRYPTODEV_DIGESTS
      char dummy_mac_key[HASH_MAX_LEN];
      unsigned char digest_res[HASH_MAX_LEN];
-@@ -141,24 +144,25 @@ static struct {
+@@ -142,24 +145,25 @@ static struct {
      int nid;
      int ivmax;
      int keylen;
@@ -60,7 +60,7 @@ index 8fb9c33..4d783d4 100644
      },
  # ifdef CRYPTO_AES_CTR
      {
-@@ -172,16 +176,22 @@ static struct {
+@@ -173,16 +177,22 @@ static struct {
      },
  # endif
      {
@@ -87,7 +87,7 @@ index 8fb9c33..4d783d4 100644
      },
  };
  
-@@ -295,13 +305,15 @@ static int get_cryptodev_ciphers(const int **cnids)
+@@ -296,13 +306,15 @@ static int get_cryptodev_ciphers(const int **cnids)
      }
      memset(&sess, 0, sizeof(sess));
      sess.key = (caddr_t) "123456789abcdefghijklmno";
@@ -104,7 +104,7 @@ index 8fb9c33..4d783d4 100644
          if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
              ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
              nids[count++] = ciphers[i].nid;
-@@ -457,6 +469,66 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -458,6 +470,66 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      return (1);
  }
  
@@ -171,7 +171,7 @@ index 8fb9c33..4d783d4 100644
  static int
  cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                     const unsigned char *iv, int enc)
-@@ -496,6 +568,45 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+@@ -497,6 +569,45 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
  }
  
  /*
@@ -217,7 +217,7 @@ index 8fb9c33..4d783d4 100644
   * free anything we allocated earlier when initting a
   * session, and close the session.
   */
-@@ -529,6 +640,63 @@ static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
+@@ -530,6 +641,63 @@ static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
      return (ret);
  }
  
@@ -281,7 +281,7 @@ index 8fb9c33..4d783d4 100644
  /*
   * libcrypto EVP stuff - this is how we get wired to EVP so the engine
   * gets called when libcrypto requests a cipher NID.
-@@ -641,6 +809,34 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
+@@ -642,6 +810,34 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
      NULL
  };
  
@@ -316,7 +316,7 @@ index 8fb9c33..4d783d4 100644
  # ifdef CRYPTO_AES_CTR
  const EVP_CIPHER cryptodev_aes_ctr = {
      NID_aes_128_ctr,
-@@ -729,6 +925,12 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -730,6 +926,12 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
          *cipher = &cryptodev_aes_ctr_256;
          break;
  # endif
@@ -329,7 +329,7 @@ index 8fb9c33..4d783d4 100644
      default:
          *cipher = NULL;
          break;
-@@ -1472,6 +1674,8 @@ void ENGINE_load_cryptodev(void)
+@@ -1485,6 +1687,8 @@ void ENGINE_load_cryptodev(void)
      }
      put_dev_crypto(fd);
  
@@ -339,5 +339,5 @@ index 8fb9c33..4d783d4 100644
          !ENGINE_set_name(engine, "BSD cryptodev engine") ||
          !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
 -- 
-2.7.0
+2.7.3
 
index 9d30cc32123980e7a223386f929af6b32de02f28..c53ffc9147375db3ede82d301c62738b327e24bb 100644 (file)
@@ -1,4 +1,4 @@
-From 36bb0879b498f8e87798848dafa058476f723165 Mon Sep 17 00:00:00 2001
+From ce6fa215fa58e7ca7a81c70ce8c91f871a20a9dd Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 31 Jul 2014 14:06:19 +0300
 Subject: [PATCH 03/48] cryptodev: fix algorithm registration
@@ -12,10 +12,10 @@ Reviewed-by: Horia Ioan Geanta Neag <horia.geanta@freescale.com>
  1 file changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 4d783d4..3b6515e 100644
+index d4da7fb..49ed638 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -134,6 +134,8 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
+@@ -135,6 +135,8 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
  static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
                            void (*f) (void));
  void ENGINE_load_cryptodev(void);
@@ -24,7 +24,7 @@ index 4d783d4..3b6515e 100644
  
  static const ENGINE_CMD_DEFN cryptodev_defns[] = {
      {0, NULL, NULL, 0}
-@@ -389,7 +391,21 @@ static int get_cryptodev_digests(const int **cnids)
+@@ -390,7 +392,21 @@ static int get_cryptodev_digests(const int **cnids)
   */
  static int cryptodev_usable_ciphers(const int **nids)
  {
@@ -47,7 +47,7 @@ index 4d783d4..3b6515e 100644
  }
  
  static int cryptodev_usable_digests(const int **nids)
-@@ -1674,8 +1690,6 @@ void ENGINE_load_cryptodev(void)
+@@ -1687,8 +1703,6 @@ void ENGINE_load_cryptodev(void)
      }
      put_dev_crypto(fd);
  
@@ -57,5 +57,5 @@ index 4d783d4..3b6515e 100644
          !ENGINE_set_name(engine, "BSD cryptodev engine") ||
          !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
 -- 
-2.7.0
+2.7.3
 
index 64a5c704c3b2370b69228282c44f32cd3289546c..5b6fda10110b57b516fb7dbdb01b79baf48a0399 100644 (file)
@@ -1,4 +1,4 @@
-From 0a9f99574266225c6fa1a10d91eb3fdc755140b8 Mon Sep 17 00:00:00 2001
+From 63ed25dadde23d01eaac6f4c4dae463ba4d7c368 Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Tue, 11 Mar 2014 05:56:54 +0545
 Subject: [PATCH 04/48] ECC Support header for Cryptodev Engine
@@ -315,5 +315,5 @@ index 0000000..af54c51
 +};
 +#endif
 -- 
-2.7.0
+2.7.3
 
index ad253064e100f10a0c03dcc438cc9f6bf4b267dc..156b743451d8ce58504d12a568e390a4bb79daa2 100644 (file)
@@ -1,4 +1,4 @@
-From e28df2a5c63dc6195a6065bfd7de9fc860129f56 Mon Sep 17 00:00:00 2001
+From aff25bbf6b5b833931a5281d30a6f26fda9f0a52 Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Tue, 11 Mar 2014 06:29:52 +0545
 Subject: [PATCH 05/48] Initial support for PKC in cryptodev engine
@@ -11,10 +11,10 @@ Signed-off-by: Yashpal Dutta <yashpal.dutta@freescale.com>
  1 file changed, 1202 insertions(+), 163 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 3b6515e..0b41bb2 100644
+index 49ed638..cc9b63b 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -58,6 +58,10 @@ void ENGINE_load_cryptodev(void)
+@@ -59,6 +59,10 @@ void ENGINE_load_cryptodev(void)
  # include <openssl/dsa.h>
  # include <openssl/err.h>
  # include <openssl/rsa.h>
@@ -25,7 +25,7 @@ index 3b6515e..0b41bb2 100644
  # include <sys/ioctl.h>
  # include <errno.h>
  # include <stdio.h>
-@@ -67,6 +71,7 @@ void ENGINE_load_cryptodev(void)
+@@ -68,6 +72,7 @@ void ENGINE_load_cryptodev(void)
  # include <syslog.h>
  # include <errno.h>
  # include <string.h>
@@ -33,7 +33,7 @@ index 3b6515e..0b41bb2 100644
  
  struct dev_crypto_state {
      struct session_op d_sess;
-@@ -115,20 +120,10 @@ static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
+@@ -116,20 +121,10 @@ static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
                                         BN_CTX *ctx);
  static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
                                   BN_CTX *ctx);
@@ -54,7 +54,7 @@ index 3b6515e..0b41bb2 100644
  static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
                                      DH *dh);
  static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
-@@ -137,6 +132,105 @@ void ENGINE_load_cryptodev(void);
+@@ -138,6 +133,105 @@ void ENGINE_load_cryptodev(void);
  const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
  
@@ -160,7 +160,7 @@ index 3b6515e..0b41bb2 100644
  static const ENGINE_CMD_DEFN cryptodev_defns[] = {
      {0, NULL, NULL, 0}
  };
-@@ -1225,7 +1319,6 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
+@@ -1230,7 +1324,6 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
   */
  static int bn2crparam(const BIGNUM *a, struct crparam *crp)
  {
@@ -168,7 +168,7 @@ index 3b6515e..0b41bb2 100644
      ssize_t bytes, bits;
      u_char *b;
  
-@@ -1243,36 +1336,21 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
+@@ -1248,36 +1341,21 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp)
      crp->crp_p = (caddr_t) b;
      crp->crp_nbits = bits;
  
@@ -208,8 +208,8 @@ index 3b6515e..0b41bb2 100644
  
      return (0);
  }
-@@ -1321,6 +1399,32 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
-     return (ret);
+@@ -1334,6 +1412,32 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
+     return ret;
  }
  
 +/* Close an opened instance of cryptodev engine */
@@ -241,7 +241,7 @@ index 3b6515e..0b41bb2 100644
  static int
  cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-@@ -1337,8 +1441,9 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+@@ -1350,8 +1454,9 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
          return (ret);
      }
  
@@ -252,7 +252,7 @@ index 3b6515e..0b41bb2 100644
  
      /* inputs: a^p % m */
      if (bn2crparam(a, &kop.crk_param[0]))
-@@ -1381,28 +1486,39 @@ static int
+@@ -1394,28 +1499,39 @@ static int
  cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
  {
      struct crypt_kop kop;
@@ -306,7 +306,7 @@ index 3b6515e..0b41bb2 100644
      kop.crk_iparams = 6;
  
      if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
-@@ -1438,93 +1554,120 @@ static RSA_METHOD cryptodev_rsa = {
+@@ -1451,93 +1567,120 @@ static RSA_METHOD cryptodev_rsa = {
      NULL                        /* rsa_verify */
  };
  
@@ -491,7 +491,7 @@ index 3b6515e..0b41bb2 100644
  }
  
  static int
-@@ -1532,43 +1675,175 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
+@@ -1545,43 +1688,175 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
                       DSA_SIG *sig, DSA *dsa)
  {
      struct crypt_kop kop;
@@ -516,7 +516,8 @@ index 3b6515e..0b41bb2 100644
 +    /* Get Order of field of private keys */
 +    if (spcf_bn2bin(dsa->q, &r, &r_len)) {
 +        DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
-+        goto err;
+         goto err;
+-    if (bn2crparam(dsa->q, &kop.crk_param[2]))
 +    }
 +
 +    g_len = q_len;
@@ -526,8 +527,7 @@ index 3b6515e..0b41bb2 100644
 +         */
 +    if (spcf_bn2bin_ex(dsa->g, &g, &g_len)) {
 +        DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
-         goto err;
--    if (bn2crparam(dsa->q, &kop.crk_param[2]))
++        goto err;
 +    }
 +    w_len = q_len;
 +        /**
@@ -688,7 +688,7 @@ index 3b6515e..0b41bb2 100644
  }
  
  static DSA_METHOD cryptodev_dsa = {
-@@ -1584,12 +1859,558 @@ static DSA_METHOD cryptodev_dsa = {
+@@ -1597,12 +1872,558 @@ static DSA_METHOD cryptodev_dsa = {
      NULL                        /* app_data */
  };
  
@@ -1252,7 +1252,7 @@ index 3b6515e..0b41bb2 100644
  }
  
  static int
-@@ -1597,41 +2418,236 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
+@@ -1610,41 +2431,236 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
  {
      struct crypt_kop kop;
      int dhret = 1;
@@ -1416,7 +1416,7 @@ index 3b6515e..0b41bb2 100644
 +            ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB);
 +            goto err;
 +        }
-+    }
+     }
 +
 +    /* irreducible polynomial that creates the field */
 +    if (spcf_bn2bin((BIGNUM *)&group->order, &r, &r_len)) {
@@ -1477,7 +1477,7 @@ index 3b6515e..0b41bb2 100644
 +    if (len > buflen || q_len < buflen) {
 +        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_INTERNAL_ERROR);
 +        goto err;
-     }
++    }
 +
 +    kop.crk_op = CRK_DH_COMPUTE_KEY;
 +    kop.crk_param[0].crp_p = (void *)s;
@@ -1507,7 +1507,7 @@ index 3b6515e..0b41bb2 100644
  }
  
  static DH_METHOD cryptodev_dh = {
-@@ -1645,6 +2661,14 @@ static DH_METHOD cryptodev_dh = {
+@@ -1658,6 +2674,14 @@ static DH_METHOD cryptodev_dh = {
      NULL                        /* app_data */
  };
  
@@ -1522,7 +1522,7 @@ index 3b6515e..0b41bb2 100644
  /*
   * ctrl right now is just a wrapper that doesn't do much
   * but I expect we'll want some options soon.
-@@ -1724,24 +2748,39 @@ void ENGINE_load_cryptodev(void)
+@@ -1737,24 +2761,39 @@ void ENGINE_load_cryptodev(void)
          memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
          if (cryptodev_asymfeat & CRF_DSA_SIGN)
              cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign;
@@ -1574,5 +1574,5 @@ index 3b6515e..0b41bb2 100644
      }
  
 -- 
-2.7.0
+2.7.3
 
index 61469dcf36a3ca5d2f5ba52f9273c0e967de84da..049f963ac7cae190b6a6acb64c8fae6e5757eee7 100644 (file)
@@ -1,4 +1,4 @@
-From c3b1f595607fe4e431dab12b7d8ceda6742547d5 Mon Sep 17 00:00:00 2001
+From e9981377fe8e2081fcd5b4e43a5ef4d8f1cc1e67 Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Tue, 11 Mar 2014 06:42:59 +0545
 Subject: [PATCH 06/48] Added hwrng dev file as source of RNG
@@ -24,5 +24,5 @@ index 1fa36c1..6c0917b 100644
  # ifndef DEVRANDOM_EGD
  /*
 -- 
-2.7.0
+2.7.3
 
index 192cd1842e41d7ec64c8aabeaeb73c5ca15171e6..154ae802222f54886f4a7fa3bf34210160e3bc84 100644 (file)
@@ -1,4 +1,4 @@
-From 45cfc01ade9eeb43fdb5950d3db152cae1b41059 Mon Sep 17 00:00:00 2001
+From ea28474ed5e1e21a6efba7570bf0d27d02923bce Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Tue, 11 Mar 2014 07:14:30 +0545
 Subject: [PATCH 07/48] Asynchronous interface added for PKC cryptodev
@@ -116,10 +116,10 @@ index d3a5efc..9b28c04 100644
      int (*init) (EC_KEY *eckey);
      int (*finish) (EC_KEY *eckey);
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 0b41bb2..8303630 100644
+index cc9b63b..90fe9b8 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1367,6 +1367,60 @@ static void zapparams(struct crypt_kop *kop)
+@@ -1371,6 +1371,60 @@ static void zapparams(struct crypt_kop *kop)
      }
  }
  
@@ -180,7 +180,7 @@ index 0b41bb2..8303630 100644
  static int
  cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
                 BIGNUM *s)
-@@ -1425,6 +1479,44 @@ void *cryptodev_init_instance(void)
+@@ -1438,6 +1492,44 @@ void *cryptodev_init_instance(void)
      return fd;
  }
  
@@ -225,7 +225,7 @@ index 0b41bb2..8303630 100644
  static int
  cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-@@ -1472,6 +1564,66 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+@@ -1485,6 +1577,66 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
  }
  
  static int
@@ -292,7 +292,7 @@ index 0b41bb2..8303630 100644
  cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
                              BN_CTX *ctx)
  {
-@@ -1538,6 +1690,63 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+@@ -1551,6 +1703,63 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
      return (ret);
  }
  
@@ -356,7 +356,7 @@ index 0b41bb2..8303630 100644
  static RSA_METHOD cryptodev_rsa = {
      "cryptodev RSA method",
      NULL,                       /* rsa_pub_enc */
-@@ -1546,6 +1755,12 @@ static RSA_METHOD cryptodev_rsa = {
+@@ -1559,6 +1768,12 @@ static RSA_METHOD cryptodev_rsa = {
      NULL,                       /* rsa_priv_dec */
      NULL,
      NULL,
@@ -369,7 +369,7 @@ index 0b41bb2..8303630 100644
      NULL,                       /* init */
      NULL,                       /* finish */
      0,                          /* flags */
-@@ -1846,128 +2061,428 @@ static int cryptodev_dsa_keygen(DSA *dsa)
+@@ -1859,128 +2074,428 @@ static int cryptodev_dsa_keygen(DSA *dsa)
      return ret;
  }
  
@@ -892,7 +892,7 @@ index 0b41bb2..8303630 100644
              goto err;
          }
      } else if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) ==
-@@ -2312,54 +2827,588 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
+@@ -2325,54 +2840,588 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
          goto err;
      }
  
@@ -1523,7 +1523,7 @@ index 0b41bb2..8303630 100644
      return ret;
  }
  
-@@ -2468,6 +3517,54 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
+@@ -2481,6 +3530,54 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
      return (dhret);
  }
  
@@ -1578,7 +1578,7 @@ index 0b41bb2..8303630 100644
  int cryptodev_ecdh_compute_key(void *out, size_t outlen,
                                 const EC_POINT *pub_key, EC_KEY *ecdh,
                                 void *(*KDF) (const void *in, size_t inlen,
-@@ -2650,6 +3747,197 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
+@@ -2663,6 +3760,197 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
      return ret;
  }
  
@@ -1776,7 +1776,7 @@ index 0b41bb2..8303630 100644
  static DH_METHOD cryptodev_dh = {
      "cryptodev DH method",
      NULL,                       /* cryptodev_dh_generate_key */
-@@ -2657,6 +3945,8 @@ static DH_METHOD cryptodev_dh = {
+@@ -2670,6 +3958,8 @@ static DH_METHOD cryptodev_dh = {
      NULL,
      NULL,
      NULL,
@@ -1785,7 +1785,7 @@ index 0b41bb2..8303630 100644
      0,                          /* flags */
      NULL                        /* app_data */
  };
-@@ -2665,6 +3955,7 @@ static ECDH_METHOD cryptodev_ecdh = {
+@@ -2678,6 +3968,7 @@ static ECDH_METHOD cryptodev_ecdh = {
      "cryptodev ECDH method",
      NULL,                       /* cryptodev_ecdh_compute_key */
      NULL,
@@ -1793,7 +1793,7 @@ index 0b41bb2..8303630 100644
      0,                          /* flags */
      NULL                        /* app_data */
  };
-@@ -2735,10 +4026,15 @@ void ENGINE_load_cryptodev(void)
+@@ -2748,10 +4039,15 @@ void ENGINE_load_cryptodev(void)
          cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec;
          if (cryptodev_asymfeat & CRF_MOD_EXP) {
              cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp;
@@ -1811,7 +1811,7 @@ index 0b41bb2..8303630 100644
          }
      }
  
-@@ -2746,12 +4042,18 @@ void ENGINE_load_cryptodev(void)
+@@ -2759,12 +4055,18 @@ void ENGINE_load_cryptodev(void)
          const DSA_METHOD *meth = DSA_OpenSSL();
  
          memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
@@ -1833,7 +1833,7 @@ index 0b41bb2..8303630 100644
      }
  
      if (ENGINE_set_DH(engine, &cryptodev_dh)) {
-@@ -2759,9 +4061,12 @@ void ENGINE_load_cryptodev(void)
+@@ -2772,9 +4074,12 @@ void ENGINE_load_cryptodev(void)
          memcpy(&cryptodev_dh, dh_meth, sizeof(DH_METHOD));
          if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) {
              cryptodev_dh.compute_key = cryptodev_dh_compute_key;
@@ -1846,7 +1846,7 @@ index 0b41bb2..8303630 100644
          }
      }
  
-@@ -2770,9 +4075,13 @@ void ENGINE_load_cryptodev(void)
+@@ -2783,9 +4088,13 @@ void ENGINE_load_cryptodev(void)
          memcpy(&cryptodev_ecdsa, meth, sizeof(ECDSA_METHOD));
          if (cryptodev_asymfeat & CRF_DSA_SIGN) {
              cryptodev_ecdsa.ecdsa_do_sign = cryptodev_ecdsa_do_sign;
@@ -1860,7 +1860,7 @@ index 0b41bb2..8303630 100644
          }
      }
  
-@@ -2781,9 +4090,16 @@ void ENGINE_load_cryptodev(void)
+@@ -2794,9 +4103,16 @@ void ENGINE_load_cryptodev(void)
          memcpy(&cryptodev_ecdh, ecdh_meth, sizeof(ECDH_METHOD));
          if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY) {
              cryptodev_ecdh.compute_key = cryptodev_ecdh_compute_key;
@@ -2046,5 +2046,5 @@ index d2ee374..7c539fc 100644
      int (*init) (RSA *rsa);
      /* called at free */
 -- 
-2.7.0
+2.7.3
 
index ccd24e316243968f373da114e004931c94427663..070b93a062c28bf5cec00cbbcf6db4adebbd411b 100644 (file)
@@ -1,4 +1,4 @@
-From 94a3fc9f437c20726209cea19256c419837055a2 Mon Sep 17 00:00:00 2001
+From 73629969c6fe54529441530674b061ce31a41d93 Mon Sep 17 00:00:00 2001
 From: Hou Zhiqiang <B48286@freescale.com>
 Date: Wed, 2 Apr 2014 16:10:43 +0800
 Subject: [PATCH 08/48] Add RSA keygen operation and support gendsa command
@@ -13,10 +13,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 120 insertions(+)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 8303630..44017a3 100644
+index 90fe9b8..8c9ad5c 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2009,6 +2009,124 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
+@@ -2022,6 +2022,124 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
      }
  }
  
@@ -141,7 +141,7 @@ index 8303630..44017a3 100644
  /* Cryptodev DSA Key Gen routine */
  static int cryptodev_dsa_keygen(DSA *dsa)
  {
-@@ -4035,6 +4153,8 @@ void ENGINE_load_cryptodev(void)
+@@ -4048,6 +4166,8 @@ void ENGINE_load_cryptodev(void)
                  cryptodev_rsa.rsa_mod_exp_async =
                      cryptodev_rsa_nocrt_mod_exp_async;
              }
@@ -151,5 +151,5 @@ index 8303630..44017a3 100644
      }
  
 -- 
-2.7.0
+2.7.3
 
index d4cd02fd2b79743fb683475516282165e64fc740..faa1690b8e65de9eccfd9603ad8cf26f6bd978a4 100644 (file)
@@ -1,4 +1,4 @@
-From ca7adb9cf57497d27136a599531ea5b9671876c7 Mon Sep 17 00:00:00 2001
+From b3726ca2b823fe2a4c675b750e6f96d4a03ce93c Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Wed, 16 Apr 2014 22:53:04 +0545
 Subject: [PATCH 09/48] RSA Keygen Fix
@@ -16,10 +16,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 44017a3..eac5fb6 100644
+index 8c9ad5c..3686c23 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2018,7 +2018,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+@@ -2031,7 +2031,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
      int i;
  
      if ((fd = get_asym_dev_crypto()) < 0)
@@ -28,7 +28,7 @@ index 44017a3..eac5fb6 100644
  
      if (!rsa->n && ((rsa->n = BN_new()) == NULL))
          goto err;
-@@ -2047,7 +2047,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+@@ -2060,7 +2060,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
      /* p length */
      kop.crk_param[kop.crk_iparams].crp_p = calloc(p_len + 1, sizeof(char));
      if (!kop.crk_param[kop.crk_iparams].crp_p)
@@ -37,7 +37,7 @@ index 44017a3..eac5fb6 100644
      kop.crk_param[kop.crk_iparams].crp_nbits = p_len * 8;
      memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, p_len + 1);
      kop.crk_iparams++;
-@@ -2055,7 +2055,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+@@ -2068,7 +2068,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
      /* q length */
      kop.crk_param[kop.crk_iparams].crp_p = calloc(q_len + 1, sizeof(char));
      if (!kop.crk_param[kop.crk_iparams].crp_p)
@@ -46,7 +46,7 @@ index 44017a3..eac5fb6 100644
      kop.crk_param[kop.crk_iparams].crp_nbits = q_len * 8;
      memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, q_len + 1);
      kop.crk_iparams++;
-@@ -2115,8 +2115,10 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+@@ -2128,8 +2128,10 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
      }
   sw_try:
      {
@@ -60,5 +60,5 @@ index 44017a3..eac5fb6 100644
      return ret;
  
 -- 
-2.7.0
+2.7.3
 
index 8908d548271c8e970072ad7362bea73eeb40bd88..22258b4d93c7f3bbf3b2f4f7afdb509e4d4a895d 100644 (file)
@@ -1,4 +1,4 @@
-From cd80be25a3da28d23dfcb2762252b413879eaa74 Mon Sep 17 00:00:00 2001
+From 1a7d37d609b5ce61d0c1454292dd4500859ed65c Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Thu, 17 Apr 2014 06:57:59 +0545
 Subject: [PATCH 10/48] Removed local copy of curve_t type
@@ -13,10 +13,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  2 files changed, 14 insertions(+), 26 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index eac5fb6..151774c 100644
+index 3686c23..afcf72b 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2504,11 +2504,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
+@@ -2517,11 +2517,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
      NULL                        /* app_data */
  };
  
@@ -28,7 +28,7 @@ index eac5fb6..151774c 100644
  /* ENGINE handler for ECDSA Sign */
  static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
                                            int dgst_len, const BIGNUM *in_kinv,
-@@ -2527,7 +2522,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
+@@ -2540,7 +2535,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
      const BIGNUM *order = NULL, *priv_key = NULL;
      const EC_GROUP *group = NULL;
      struct crypt_kop kop;
@@ -37,7 +37,7 @@ index eac5fb6..151774c 100644
  
      memset(&kop, 0, sizeof(kop));
      ecdsa = ecdsa_check(eckey);
-@@ -2665,7 +2660,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
+@@ -2678,7 +2673,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
              else
                  goto err;
          }
@@ -46,7 +46,7 @@ index eac5fb6..151774c 100644
      }
  
      /* Calculation of Generator point */
-@@ -2760,7 +2755,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
+@@ -2773,7 +2768,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
      const EC_POINT *pub_key = NULL;
      const BIGNUM *order = NULL;
      const EC_GROUP *group = NULL;
@@ -55,7 +55,7 @@ index eac5fb6..151774c 100644
      struct crypt_kop kop;
  
      memset(&kop, 0, sizeof kop);
-@@ -2911,7 +2906,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
+@@ -2924,7 +2919,7 @@ static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
              else
                  goto err;
          }
@@ -64,7 +64,7 @@ index eac5fb6..151774c 100644
      }
  
      /* Calculation of Generator point */
-@@ -3016,7 +3011,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
+@@ -3029,7 +3024,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
      const BIGNUM *order = NULL, *priv_key = NULL;
      const EC_GROUP *group = NULL;
      struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
@@ -73,7 +73,7 @@ index eac5fb6..151774c 100644
  
      if (!(sig->r = BN_new()) || !kop)
          goto err;
-@@ -3157,7 +3152,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
+@@ -3170,7 +3165,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
              else
                  goto err;
          }
@@ -82,7 +82,7 @@ index eac5fb6..151774c 100644
      }
  
      /* Calculation of Generator point */
-@@ -3237,7 +3232,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
+@@ -3250,7 +3245,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
      const EC_POINT *pub_key = NULL;
      const BIGNUM *order = NULL;
      const EC_GROUP *group = NULL;
@@ -91,7 +91,7 @@ index eac5fb6..151774c 100644
      struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
  
      if (!kop)
-@@ -3384,7 +3379,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
+@@ -3397,7 +3392,7 @@ static int cryptodev_ecdsa_verify_async(const unsigned char *dgst,
      if (ec_crv == EC_BINARY) {
          /* copy b' i.e c(b), instead of only b */
          eng_ec_get_cparam(EC_GROUP_get_curve_name(group), ab + q_len, q_len);
@@ -100,7 +100,7 @@ index eac5fb6..151774c 100644
      }
  
      /* Calculation of Generator point */
-@@ -3690,7 +3685,7 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
+@@ -3703,7 +3698,7 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
                                 void *(*KDF) (const void *in, size_t inlen,
                                               void *out, size_t *outlen))
  {
@@ -109,7 +109,7 @@ index eac5fb6..151774c 100644
      unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL;
      BIGNUM *w_x = NULL, *w_y = NULL;
      int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0;
-@@ -3820,9 +3815,9 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
+@@ -3833,9 +3828,9 @@ int cryptodev_ecdh_compute_key(void *out, size_t outlen,
              else
                  goto err;
          }
@@ -121,7 +121,7 @@ index eac5fb6..151774c 100644
  
      priv_key_len = r_len;
  
-@@ -3874,7 +3869,7 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
+@@ -3887,7 +3882,7 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
                                                     size_t *outlen),
                                       struct pkc_cookie_s *cookie)
  {
@@ -130,7 +130,7 @@ index eac5fb6..151774c 100644
      unsigned char *q = NULL, *w_xy = NULL, *ab = NULL, *s = NULL, *r = NULL;
      BIGNUM *w_x = NULL, *w_y = NULL;
      int q_len = 0, ab_len = 0, pub_key_len = 0, r_len = 0, priv_key_len = 0;
-@@ -4005,9 +4000,9 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
+@@ -4018,9 +4013,9 @@ int cryptodev_ecdh_compute_key_async(void *out, size_t outlen,
              else
                  goto err;
          }
@@ -159,5 +159,5 @@ index af54c51..41a8702 100644
 -};
  #endif
 -- 
-2.7.0
+2.7.3
 
index 13aea0156605300afc89ed605b6b2de62d0563ee..d7fb223415f8334e3a1261f1373442649d9bf3e0 100644 (file)
@@ -1,4 +1,4 @@
-From f9d9da58818740334ef356d0384d4e88da865dca Mon Sep 17 00:00:00 2001
+From 82afed6364dfcced7458dbd2bda7932054078f04 Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Tue, 22 Apr 2014 22:58:33 +0545
 Subject: [PATCH 11/48] Modulus parameter is not populated by dhparams
@@ -17,10 +17,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 151774c..1f1f307 100644
+index afcf72b..2013746 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -3502,7 +3502,7 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
+@@ -3515,7 +3515,7 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
      kop->crk_op = CRK_DH_GENERATE_KEY;
      if (bn2crparam(dh->p, &kop->crk_param[0]))
          goto sw_try;
@@ -29,7 +29,7 @@ index 151774c..1f1f307 100644
          goto sw_try;
      kop->crk_param[2].crp_p = g;
      kop->crk_param[2].crp_nbits = g_len * 8;
-@@ -3557,7 +3557,7 @@ static int cryptodev_dh_keygen(DH *dh)
+@@ -3570,7 +3570,7 @@ static int cryptodev_dh_keygen(DH *dh)
      kop.crk_op = CRK_DH_GENERATE_KEY;
      if (bn2crparam(dh->p, &kop.crk_param[0]))
          goto sw_try;
@@ -39,5 +39,5 @@ index 151774c..1f1f307 100644
      kop.crk_param[2].crp_p = g;
      kop.crk_param[2].crp_nbits = g_len * 8;
 -- 
-2.7.0
+2.7.3
 
index bf36a32261f20601e8c4fda5d439aaa0863f4613..b665f7a94c749ba2bb6717b0c8f325ce3d6d9e06 100644 (file)
@@ -1,4 +1,4 @@
-From 18f4dbbba2c0142792b394bec35531cefe277712 Mon Sep 17 00:00:00 2001
+From f7817245b35156ec2b15514c952db806140c6ebc Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Thu, 24 Apr 2014 00:35:34 +0545
 Subject: [PATCH 12/48] SW Backoff mechanism for dsa keygen
@@ -16,10 +16,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 1f1f307..db8e02d 100644
+index 2013746..a3a97d2 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2175,8 +2175,10 @@ static int cryptodev_dsa_keygen(DSA *dsa)
+@@ -2188,8 +2188,10 @@ static int cryptodev_dsa_keygen(DSA *dsa)
      return ret;
   sw_try:
      {
@@ -32,7 +32,7 @@ index 1f1f307..db8e02d 100644
      }
      return ret;
  }
-@@ -2230,11 +2232,13 @@ static int cryptodev_dsa_keygen_async(DSA *dsa, struct pkc_cookie_s *cookie)
+@@ -2243,11 +2245,13 @@ static int cryptodev_dsa_keygen_async(DSA *dsa, struct pkc_cookie_s *cookie)
      return ret;
   sw_try:
      {
@@ -49,5 +49,5 @@ index 1f1f307..db8e02d 100644
      }
      return ret;
 -- 
-2.7.0
+2.7.3
 
index 12465d7efd442d9e8e3a1a0c29913aa78d8c17ca..4f8fd4de378e91f4da1c373b0fd156a9f405c28d 100644 (file)
@@ -1,4 +1,4 @@
-From 4d5ffd41f423309fc9aaf3621598ca51c5838e31 Mon Sep 17 00:00:00 2001
+From 0075a1d36133523a40efc66d6491a4f11aca87fd Mon Sep 17 00:00:00 2001
 From: Yashpal Dutta <yashpal.dutta@freescale.com>
 Date: Thu, 1 May 2014 06:35:45 +0545
 Subject: [PATCH 13/48] Fixed DH keygen pair generator
@@ -14,10 +14,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 33 insertions(+), 17 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index db8e02d..4929ae6 100644
+index a3a97d2..5a9f4b7 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -3534,44 +3534,60 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
+@@ -3547,44 +3547,60 @@ static int cryptodev_dh_keygen_async(DH *dh, struct pkc_cookie_s *cookie)
  static int cryptodev_dh_keygen(DH *dh)
  {
      struct crypt_kop kop;
@@ -96,5 +96,5 @@ index db8e02d..4929ae6 100644
   sw_try:
      {
 -- 
-2.7.0
+2.7.3
 
index 5a8c2d290a5d3e1f8db5b73f66f048b14d7ce08e..898499b492e487dc9c7ac5524a8e41e2d9960b6a 100644 (file)
@@ -1,4 +1,4 @@
-From 317e3d9870097e6b115dd8c9a13ccb5e5ca76f2e Mon Sep 17 00:00:00 2001
+From fcbd6199deb715b117153b7df00cdd4cdec44d79 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Mon, 16 Jun 2014 14:06:21 +0300
 Subject: [PATCH 14/48] cryptodev: add support for aes-gcm algorithm offloading
@@ -10,7 +10,7 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  2 files changed, 240 insertions(+), 2 deletions(-)
 
 diff --git a/apps/speed.c b/apps/speed.c
-index 95adcc1..e5e609b 100644
+index b862868..fd2a2a5 100644
 --- a/apps/speed.c
 +++ b/apps/speed.c
 @@ -226,7 +226,11 @@
@@ -27,7 +27,7 @@ index 95adcc1..e5e609b 100644
  
  static int mr = 0;
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 4929ae6..d2cdca0 100644
+index 5a9f4b7..1754917 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
 @@ -2,6 +2,7 @@
@@ -38,7 +38,7 @@ index 4929ae6..d2cdca0 100644
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
-@@ -77,8 +78,10 @@ struct dev_crypto_state {
+@@ -78,8 +79,10 @@ struct dev_crypto_state {
      struct session_op d_sess;
      int d_fd;
      unsigned char *aad;
@@ -50,7 +50,7 @@ index 4929ae6..d2cdca0 100644
  # ifdef USE_CRYPTODEV_DIGESTS
      char dummy_mac_key[HASH_MAX_LEN];
      unsigned char digest_res[HASH_MAX_LEN];
-@@ -287,6 +290,9 @@ static struct {
+@@ -288,6 +291,9 @@ static struct {
          CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20
      },
      {
@@ -60,7 +60,7 @@ index 4929ae6..d2cdca0 100644
          0, NID_undef, 0, 0, 0
      },
  };
-@@ -325,6 +331,22 @@ static struct {
+@@ -326,6 +332,22 @@ static struct {
  };
  # endif
  
@@ -83,7 +83,7 @@ index 4929ae6..d2cdca0 100644
  /*
   * Return a fd if /dev/crypto seems usable, 0 otherwise.
   */
-@@ -807,6 +829,199 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -808,6 +830,199 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
      }
  }
  
@@ -283,7 +283,7 @@ index 4929ae6..d2cdca0 100644
  /*
   * libcrypto EVP stuff - this is how we get wired to EVP so the engine
   * gets called when libcrypto requests a cipher NID.
-@@ -947,6 +1162,22 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
+@@ -948,6 +1163,22 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
      NULL
  };
  
@@ -306,7 +306,7 @@ index 4929ae6..d2cdca0 100644
  # ifdef CRYPTO_AES_CTR
  const EVP_CIPHER cryptodev_aes_ctr = {
      NID_aes_128_ctr,
-@@ -1041,6 +1272,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -1042,6 +1273,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
      case NID_aes_256_cbc_hmac_sha1:
          *cipher = &cryptodev_aes_256_cbc_hmac_sha1;
          break;
@@ -317,5 +317,5 @@ index 4929ae6..d2cdca0 100644
          *cipher = NULL;
          break;
 -- 
-2.7.0
+2.7.3
 
index 623c58b98871491e95a311480d1b7078aa94a0ee..c1201f267c115e22390ea0d037b19db21fe35107 100644 (file)
@@ -1,4 +1,4 @@
-From 7dd6b35c35b027be8ef0ef2e29a949bc4ce96bbd Mon Sep 17 00:00:00 2001
+From 6094ec91a5b8dde4bc3a7928b7cb6c81cac8a169 Mon Sep 17 00:00:00 2001
 From: Tudor Ambarus <tudor.ambarus@freescale.com>
 Date: Fri, 9 May 2014 17:54:06 +0300
 Subject: [PATCH 15/48] eng_cryptodev: extend TLS offload with
@@ -23,10 +23,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  6 files changed, 43 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index d2cdca0..8f73a18 100644
+index 1754917..ae644b9 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -132,6 +132,7 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
+@@ -133,6 +133,7 @@ static int cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key,
  static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
                            void (*f) (void));
  void ENGINE_load_cryptodev(void);
@@ -34,7 +34,7 @@ index d2cdca0..8f73a18 100644
  const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
  
-@@ -284,6 +285,9 @@ static struct {
+@@ -285,6 +286,9 @@ static struct {
          CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, 0
      },
      {
@@ -44,7 +44,7 @@ index d2cdca0..8f73a18 100644
          CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_128_cbc_hmac_sha1, 16, 16, 20
      },
      {
-@@ -519,6 +523,9 @@ static int cryptodev_usable_ciphers(const int **nids)
+@@ -520,6 +524,9 @@ static int cryptodev_usable_ciphers(const int **nids)
          case NID_aes_256_cbc_hmac_sha1:
              EVP_add_cipher(&cryptodev_aes_256_cbc_hmac_sha1);
              break;
@@ -54,7 +54,7 @@ index d2cdca0..8f73a18 100644
          }
      }
      return count;
-@@ -623,6 +630,7 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -624,6 +631,7 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      switch (ctx->cipher->nid) {
      case NID_aes_128_cbc_hmac_sha1:
      case NID_aes_256_cbc_hmac_sha1:
@@ -62,7 +62,7 @@ index d2cdca0..8f73a18 100644
          cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
      }
      cryp.ses = sess->ses;
-@@ -813,6 +821,7 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -814,6 +822,7 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
              switch (ctx->cipher->nid) {
              case NID_aes_128_cbc_hmac_sha1:
              case NID_aes_256_cbc_hmac_sha1:
@@ -70,7 +70,7 @@ index d2cdca0..8f73a18 100644
                  maclen = SHA_DIGEST_LENGTH;
              }
  
-@@ -1134,6 +1143,20 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
+@@ -1135,6 +1144,20 @@ const EVP_CIPHER cryptodev_aes_256_cbc = {
      NULL
  };
  
@@ -91,7 +91,7 @@ index d2cdca0..8f73a18 100644
  const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1 = {
      NID_aes_128_cbc_hmac_sha1,
      16, 16, 16,
-@@ -1255,6 +1278,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -1256,6 +1279,9 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
      case NID_aes_256_cbc:
          *cipher = &cryptodev_aes_256_cbc;
          break;
@@ -180,7 +180,7 @@ index b57aabb..4e1ff18 100644
  ISO-US 10046 2 1      : dhpublicnumber                : X9.42 DH
  
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index 302464e..a379273 100644
+index 2ad8f43..fdf6be9 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -668,6 +668,10 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -195,5 +195,5 @@ index 302464e..a379273 100644
      } else
          return (0);
 -- 
-2.7.0
+2.7.3
 
index c5866212c8d6971aa666bd74ea9cfb8b65e5e264..d6b72b5705516df1514addf42df481c15a458dda 100644 (file)
@@ -1,4 +1,4 @@
-From 3f34089ab0a3b31ec6b31a6cbf308ca20c6ef597 Mon Sep 17 00:00:00 2001
+From 4a229203e276283cb894b08b2607204a647d7594 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Fri, 22 Jan 2016 11:58:34 +0200
 Subject: [PATCH 16/48] eng_cryptodev: add support for TLSv1.1 record offload
@@ -23,10 +23,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  6 files changed, 151 insertions(+), 9 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 8f73a18..e37a661 100644
+index ae644b9..80b20e5 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -66,6 +66,7 @@ void ENGINE_load_cryptodev(void)
+@@ -67,6 +67,7 @@ void ENGINE_load_cryptodev(void)
  # include <sys/ioctl.h>
  # include <errno.h>
  # include <stdio.h>
@@ -34,7 +34,7 @@ index 8f73a18..e37a661 100644
  # include <unistd.h>
  # include <fcntl.h>
  # include <stdarg.h>
-@@ -135,6 +136,9 @@ void ENGINE_load_cryptodev(void);
+@@ -136,6 +137,9 @@ void ENGINE_load_cryptodev(void);
  const EVP_CIPHER cryptodev_3des_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_aes_128_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
@@ -44,7 +44,7 @@ index 8f73a18..e37a661 100644
  
  inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
  {
-@@ -294,6 +298,18 @@ static struct {
+@@ -295,6 +299,18 @@ static struct {
          CRYPTO_TLS10_AES_CBC_HMAC_SHA1, NID_aes_256_cbc_hmac_sha1, 16, 32, 20
      },
      {
@@ -63,7 +63,7 @@ index 8f73a18..e37a661 100644
          CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0
      },
      {
-@@ -526,6 +542,15 @@ static int cryptodev_usable_ciphers(const int **nids)
+@@ -527,6 +543,15 @@ static int cryptodev_usable_ciphers(const int **nids)
          case NID_des_ede3_cbc_hmac_sha1:
              EVP_add_cipher(&cryptodev_3des_cbc_hmac_sha1);
              break;
@@ -79,7 +79,7 @@ index 8f73a18..e37a661 100644
          }
      }
      return count;
-@@ -631,6 +656,9 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -632,6 +657,9 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      case NID_aes_128_cbc_hmac_sha1:
      case NID_aes_256_cbc_hmac_sha1:
      case NID_des_ede3_cbc_hmac_sha1:
@@ -89,7 +89,7 @@ index 8f73a18..e37a661 100644
          cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
      }
      cryp.ses = sess->ses;
-@@ -810,8 +838,9 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -811,8 +839,9 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
              struct dev_crypto_state *state = ctx->cipher_data;
              unsigned char *p = ptr;
              unsigned int cryptlen = p[arg - 2] << 8 | p[arg - 1];
@@ -100,7 +100,7 @@ index 8f73a18..e37a661 100644
  
              state->aad = ptr;
              state->aad_len = arg;
-@@ -823,6 +852,20 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -824,6 +853,20 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
              case NID_aes_256_cbc_hmac_sha1:
              case NID_des_ede3_cbc_hmac_sha1:
                  maclen = SHA_DIGEST_LENGTH;
@@ -121,7 +121,7 @@ index 8f73a18..e37a661 100644
              }
  
              /* space required for encryption (not only TLS padding) */
-@@ -1185,6 +1228,48 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
+@@ -1186,6 +1229,48 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1 = {
      NULL
  };
  
@@ -170,7 +170,7 @@ index 8f73a18..e37a661 100644
  const EVP_CIPHER cryptodev_aes_128_gcm = {
      NID_aes_128_gcm,
      1, 16, 12,
-@@ -1298,6 +1383,15 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -1299,6 +1384,15 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
      case NID_aes_256_cbc_hmac_sha1:
          *cipher = &cryptodev_aes_256_cbc_hmac_sha1;
          break;
@@ -285,7 +285,7 @@ index 4e1ff18..cda81da 100644
  ISO-US 10046 2 1      : dhpublicnumber                : X9.42 DH
  
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index a379273..e3d73ac 100644
+index fdf6be9..b4af7dc 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -652,11 +652,13 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -334,5 +334,5 @@ index a379273..e3d73ac 100644
          return (1);
      } else
 -- 
-2.7.0
+2.7.3
 
index 5e65ec6ee57ee16627537afa1c28c5afb026e1c1..30348941f4f29afd1b7140703a630e5d8b99f31f 100644 (file)
@@ -1,4 +1,4 @@
-From 4c1531a088076118ce3c06cb0af15998f0796cb3 Mon Sep 17 00:00:00 2001
+From 0103fb8e6fc412462968224ec9315609c54eccc1 Mon Sep 17 00:00:00 2001
 From: Tudor Ambarus <tudor.ambarus@freescale.com>
 Date: Tue, 31 Mar 2015 16:32:35 +0300
 Subject: [PATCH 17/48] eng_cryptodev: add support for TLSv1.2 record offload
@@ -25,10 +25,10 @@ Tested-by: Cristian Stoica <cristian.stoica@freescale.com>
  6 files changed, 216 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index e37a661..e6f9f16 100644
+index 80b20e5..455868e 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -139,6 +139,11 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
+@@ -140,6 +140,11 @@ const EVP_CIPHER cryptodev_aes_256_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_tls11_3des_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_tls11_aes_128_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1;
@@ -40,7 +40,7 @@ index e37a661..e6f9f16 100644
  
  inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
  {
-@@ -310,6 +315,26 @@ static struct {
+@@ -311,6 +316,26 @@ static struct {
          20
      },
      {
@@ -67,7 +67,7 @@ index e37a661..e6f9f16 100644
          CRYPTO_AES_GCM, NID_aes_128_gcm, 16, 16, 0
      },
      {
-@@ -551,6 +576,21 @@ static int cryptodev_usable_ciphers(const int **nids)
+@@ -552,6 +577,21 @@ static int cryptodev_usable_ciphers(const int **nids)
          case NID_tls11_aes_256_cbc_hmac_sha1:
              EVP_add_cipher(&cryptodev_tls11_aes_256_cbc_hmac_sha1);
              break;
@@ -89,7 +89,7 @@ index e37a661..e6f9f16 100644
          }
      }
      return count;
-@@ -659,6 +699,11 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -660,6 +700,11 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      case NID_tls11_des_ede3_cbc_hmac_sha1:
      case NID_tls11_aes_128_cbc_hmac_sha1:
      case NID_tls11_aes_256_cbc_hmac_sha1:
@@ -101,7 +101,7 @@ index e37a661..e6f9f16 100644
          cryp.flags = COP_FLAG_AEAD_TLS_TYPE;
      }
      cryp.ses = sess->ses;
-@@ -856,9 +901,17 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -857,9 +902,17 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
              case NID_tls11_des_ede3_cbc_hmac_sha1:
              case NID_tls11_aes_128_cbc_hmac_sha1:
              case NID_tls11_aes_256_cbc_hmac_sha1:
@@ -119,7 +119,7 @@ index e37a661..e6f9f16 100644
              }
  
              /* Correct length for AAD Length field */
-@@ -1270,6 +1323,76 @@ const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1 = {
+@@ -1271,6 +1324,76 @@ const EVP_CIPHER cryptodev_tls11_aes_256_cbc_hmac_sha1 = {
      NULL
  };
  
@@ -196,7 +196,7 @@ index e37a661..e6f9f16 100644
  const EVP_CIPHER cryptodev_aes_128_gcm = {
      NID_aes_128_gcm,
      1, 16, 12,
-@@ -1395,6 +1518,21 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -1396,6 +1519,21 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
      case NID_aes_128_gcm:
          *cipher = &cryptodev_aes_128_gcm;
          break;
@@ -337,7 +337,7 @@ index cda81da..68a8da8 100644
  ISO-US 10046 2 1      : dhpublicnumber                : X9.42 DH
  
 diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
-index e3d73ac..4698528 100644
+index b4af7dc..359cb5d 100644
 --- a/ssl/ssl_ciph.c
 +++ b/ssl/ssl_ciph.c
 @@ -690,6 +690,31 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
@@ -373,5 +373,5 @@ index e3d73ac..4698528 100644
      } else
          return (0);
 -- 
-2.7.0
+2.7.3
 
index c1f0c9dbece7dd4500645ca666c6dd710a6e0d7f..cf6cce26f89b574314456d7d36e10d3afc01d3d9 100644 (file)
@@ -1,4 +1,4 @@
-From 07d8dad75fb1e4c3487ae560ac51e2141aa0e0c1 Mon Sep 17 00:00:00 2001
+From dddb8bc7eea34dfc73c1f5c8863d19894d9a18ac Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 19 Feb 2015 16:11:53 +0200
 Subject: [PATCH 18/48] cryptodev: drop redundant function
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 3 insertions(+), 14 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index e6f9f16..4cffaf1 100644
+index 455868e..d229f61 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -93,7 +93,6 @@ struct dev_crypto_state {
+@@ -94,7 +94,6 @@ struct dev_crypto_state {
  
  static u_int32_t cryptodev_asymfeat = 0;
  
@@ -23,7 +23,7 @@ index e6f9f16..4cffaf1 100644
  static int open_dev_crypto(void);
  static int get_dev_crypto(void);
  static int get_cryptodev_ciphers(const int **cnids);
-@@ -440,16 +439,6 @@ static void put_dev_crypto(int fd)
+@@ -441,16 +440,6 @@ static void put_dev_crypto(int fd)
  # endif
  }
  
@@ -40,16 +40,16 @@ index e6f9f16..4cffaf1 100644
  /*
   * Find out what ciphers /dev/crypto will let us have a session for.
   * XXX note, that some of these openssl doesn't deal with yet!
-@@ -1919,7 +1908,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
+@@ -1923,7 +1912,7 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
  {
      int fd, ret = -1;
  
 -    if ((fd = get_asym_dev_crypto()) < 0)
 +    if ((fd = get_dev_crypto()) < 0)
-         return (ret);
+         return ret;
  
      if (r) {
-@@ -2509,7 +2498,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+@@ -2522,7 +2511,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
      int p_len, q_len;
      int i;
  
@@ -58,7 +58,7 @@ index e6f9f16..4cffaf1 100644
          goto sw_try;
  
      if (!rsa->n && ((rsa->n = BN_new()) == NULL))
-@@ -4098,7 +4087,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
+@@ -4111,7 +4100,7 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
      BIGNUM *temp = NULL;
      unsigned char *padded_pub_key = NULL, *p = NULL;
  
@@ -68,5 +68,5 @@ index e6f9f16..4cffaf1 100644
  
      memset(&kop, 0, sizeof kop);
 -- 
-2.7.0
+2.7.3
 
index 248d88ec173896ef2104c8703352eb2d8872103c..d423dd107ea7ac896dee7aa0d2a6bacc32f1f34c 100644 (file)
@@ -1,4 +1,4 @@
-From 1f7ef531a010a3a86c9c16f801044b5f01652eb2 Mon Sep 17 00:00:00 2001
+From 413ef57790244fc521d40ade62358abaf0a55d10 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Tue, 17 Feb 2015 13:12:53 +0200
 Subject: [PATCH 19/48] cryptodev: do not zero the buffer before use
@@ -14,10 +14,10 @@ Reviewed-on: http://git.am.freescale.net:8181/34217
  1 file changed, 4 insertions(+), 10 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 4cffaf1..bbc903b 100644
+index d229f61..4d370ad 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1801,21 +1801,15 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
+@@ -1806,21 +1806,15 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
  static int bn2crparam(const BIGNUM *a, struct crparam *crp)
  {
      ssize_t bytes, bits;
@@ -44,5 +44,5 @@ index 4cffaf1..bbc903b 100644
      BN_bn2bin(a, crp->crp_p);
      return (0);
 -- 
-2.7.0
+2.7.3
 
index c600bdab4e0ecf74fff7fb26d6c423f170aab13d..d82dc5c3cab01389bb6f5b792061b6f742a72e74 100644 (file)
@@ -1,4 +1,4 @@
-From 453c617b10fb2c4e748b5799ab4b00c184470c60 Mon Sep 17 00:00:00 2001
+From ac3dfaf10125f08454d51e8fc4b3a77d33fd96d0 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Wed, 18 Feb 2015 10:39:46 +0200
 Subject: [PATCH 20/48] cryptodev: clean-up code layout
@@ -11,10 +11,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 21 insertions(+), 24 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index bbc903b..14dcddf 100644
+index 4d370ad..487a2c9 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1865,32 +1865,29 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
+@@ -1869,32 +1869,29 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
      fd = *(int *)cookie->eng_handle;
  
      eng_cookie = malloc(sizeof(struct cryptodev_cookie_s));
@@ -69,5 +69,5 @@ index bbc903b..14dcddf 100644
      cookie->eng_cookie = eng_cookie;
      return ioctl(fd, CIOCASYMASYNCRYPT, kop);
 -- 
-2.7.0
+2.7.3
 
index 9c6e503b89c286fca39390b70a93fdd36d54af3b..fa825bb5c7f73c9e0e93876c8420b527b92cfb70 100644 (file)
@@ -1,4 +1,4 @@
-From d9395f7d876f7dfaaae25867c88d1e1f684589de Mon Sep 17 00:00:00 2001
+From b96074f4e44b2147d4d771dd086463c9cb7d42a3 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 19 Feb 2015 16:43:29 +0200
 Subject: [PATCH 21/48] cryptodev: do not cache file descriptor in 'open'
@@ -18,10 +18,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
  1 file changed, 21 insertions(+), 22 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 14dcddf..75fca7f 100644
+index 487a2c9..d7188a6 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -391,45 +391,44 @@ static void ctr64_inc(unsigned char *counter)
+@@ -392,45 +392,44 @@ static void ctr64_inc(unsigned char *counter)
      } while (n);
  }
  
@@ -89,5 +89,5 @@ index 14dcddf..75fca7f 100644
  
  static void put_dev_crypto(int fd)
 -- 
-2.7.0
+2.7.3
 
index 121123d63ec2c843618b16a3fdad09f8115a370b..eddb1f24f52440239735f93cba568ea318acb47a 100644 (file)
@@ -1,4 +1,4 @@
-From 79d6976e2ad2e5ac31374bc24ee29ae53f55c0e1 Mon Sep 17 00:00:00 2001
+From 43710e60fd8bae1ebc4d1eef6d86cb4e82653ac4 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 19 Feb 2015 13:09:32 +0200
 Subject: [PATCH 22/48] cryptodev: put_dev_crypto should be an int
@@ -11,10 +11,10 @@ Reviewed-on: http://git.am.freescale.net:8181/34220
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 75fca7f..b162646 100644
+index d7188a6..7b3dbd1 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -431,10 +431,12 @@ static int get_dev_crypto(void)
+@@ -432,10 +432,12 @@ static int get_dev_crypto(void)
  # endif
  }
  
@@ -31,5 +31,5 @@ index 75fca7f..b162646 100644
  }
  
 -- 
-2.7.0
+2.7.3
 
index 1043fbd49716940264214051803e3994cd48a7f3..4f589af74075419912e71b92c17e19ea410b4e69 100644 (file)
@@ -1,4 +1,4 @@
-From f99682e0ccaeadb7446d211dfad6dbf8fcd5675f Mon Sep 17 00:00:00 2001
+From b706132a33555162e6dbf26d9fde4bcb1136d553 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@freescale.com>
 Date: Thu, 19 Feb 2015 13:39:52 +0200
 Subject: [PATCH 23/48] cryptodev: simplify cryptodev pkc support code
@@ -29,10 +29,10 @@ index 2b4ec59..ddb9b69 100644
  
  #ifdef  __cplusplus
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index b162646..1910c89 100644
+index 7b3dbd1..34c8d18 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -433,10 +433,10 @@ static int get_dev_crypto(void)
+@@ -434,10 +434,10 @@ static int get_dev_crypto(void)
  
  static int put_dev_crypto(int fd)
  {
@@ -47,7 +47,7 @@ index b162646..1910c89 100644
  # endif
  }
  
-@@ -1863,7 +1863,7 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
+@@ -1867,7 +1867,7 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
      struct pkc_cookie_s *cookie = kop->cookie;
      struct cryptodev_cookie_s *eng_cookie;
  
@@ -56,8 +56,8 @@ index b162646..1910c89 100644
  
      eng_cookie = malloc(sizeof(struct cryptodev_cookie_s));
      if (!eng_cookie)
-@@ -1926,38 +1926,11 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
-     return (ret);
+@@ -1939,38 +1939,11 @@ cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
+     return ret;
  }
  
 -/* Close an opened instance of cryptodev engine */
@@ -96,7 +96,7 @@ index b162646..1910c89 100644
      struct pkc_cookie_list_s cookie_list;
      struct pkc_cookie_s *cookie;
      int i;
-@@ -4706,8 +4679,8 @@ void ENGINE_load_cryptodev(void)
+@@ -4719,8 +4692,8 @@ void ENGINE_load_cryptodev(void)
      }
  
      ENGINE_set_check_pkc_availability(engine, cryptodev_check_availability);
@@ -256,5 +256,5 @@ index 4527aa1..f83ee73 100644
  int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
  int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
 -- 
-2.7.0
+2.7.3
 
index 27ccd95a5f3f005d49846af72e21790caf6a1d56..0daa2a4d05f7297d5cb454e4d8a145681e21ba2f 100644 (file)
@@ -1,4 +1,4 @@
-From cb6842dac159b40acdc755526b0ba0afb61d9d64 Mon Sep 17 00:00:00 2001
+From e1de7751808d5196a9a719ad49a1281d2a3c453d Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 14 Dec 2015 14:02:00 +0200
 Subject: [PATCH 24/48] cryptodev: clarify code, remove assignments from
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 1910c89..fcfd232 100644
+index 34c8d18..31687d8 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1559,14 +1559,16 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1560,14 +1560,16 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
      struct session_op *sess = &state->d_sess;
      int digest;
  
@@ -33,5 +33,5 @@ index 1910c89..fcfd232 100644
          return (0);
      }
 -- 
-2.7.0
+2.7.3
 
index ad5c3035e57c064268da853ad5e2c4d32b6b8844..3e02c72bd0dabd0133b05f53889726ff227bd92a 100644 (file)
@@ -1,4 +1,4 @@
-From 087ae4ecbaf9cd49a2fcae9cb09c491beabc4c88 Mon Sep 17 00:00:00 2001
+From 9ffa46ff1348817f4c8d24e9d42fa0f739a652d7 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 15 Dec 2015 12:10:37 +0200
 Subject: [PATCH 25/48] cryptodev: clean-up context state before anything else
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index fcfd232..16e6fd9 100644
+index 31687d8..e6616e9 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1559,14 +1559,14 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1560,14 +1560,14 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
      struct session_op *sess = &state->d_sess;
      int digest;
  
@@ -30,5 +30,5 @@ index fcfd232..16e6fd9 100644
      if (state->d_fd < 0) {
          printf("cryptodev_digest_init: Can't get Dev \n");
 -- 
-2.7.0
+2.7.3
 
index 936aafcedda1aba60d936ec0134e65c664c029a2..4e1ce65d135898ffad18e49128c06ac54dd90ba8 100644 (file)
@@ -1,4 +1,4 @@
-From 02dd4d275f7544a4027ca3452b60ac5bdd9376fb Mon Sep 17 00:00:00 2001
+From 7f6a709ed46d79d765ee0bb2fc16b84d0bb4c8a6 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 14 Dec 2015 17:49:08 +0200
 Subject: [PATCH 26/48] cryptodev: remove code duplication in digest operations
@@ -17,10 +17,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 28 insertions(+), 48 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 16e6fd9..048e050 100644
+index e6616e9..a8652bf 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1590,24 +1590,25 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1591,24 +1591,25 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
  static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
                                     size_t count)
  {
@@ -57,7 +57,7 @@ index 16e6fd9..048e050 100644
          if (!state->mac_data) {
              printf("cryptodev_digest_update: realloc failed\n");
              return (0);
-@@ -1615,23 +1616,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1616,23 +1617,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
  
          memcpy(state->mac_data + state->mac_len, data, count);
          state->mac_len += count;
@@ -82,7 +82,7 @@ index 16e6fd9..048e050 100644
  }
  
  static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
-@@ -1640,33 +1627,25 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1641,33 +1628,25 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
      struct dev_crypto_state *state = ctx->md_data;
      struct session_op *sess = &state->d_sess;
  
@@ -127,7 +127,7 @@ index 16e6fd9..048e050 100644
  }
  
  static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
-@@ -1683,11 +1662,11 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
+@@ -1684,11 +1663,11 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
          return (0);
      }
  
@@ -142,7 +142,7 @@ index 16e6fd9..048e050 100644
  
      if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
          printf("cryptodev_digest_cleanup: failed to close session\n");
-@@ -1695,6 +1674,7 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
+@@ -1696,6 +1675,7 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
      } else {
          ret = 1;
      }
@@ -151,5 +151,5 @@ index 16e6fd9..048e050 100644
      state->d_fd = -1;
  
 -- 
-2.7.0
+2.7.3
 
index 46b3ced9cefb2fdc14de7d4988f91f93e2b4e4c9..0810889718a6c47c561079fd055295afcccba965 100644 (file)
@@ -1,4 +1,4 @@
-From 2187b18ffe4851efcb6465ca02ac036d2fe031b8 Mon Sep 17 00:00:00 2001
+From 0307a70fc4399a0ee758172e385d4daaae669ce6 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 15 Dec 2015 12:23:13 +0200
 Subject: [PATCH 27/48] cryptodev: put all digest ioctls into a single function
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 19 insertions(+), 25 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 048e050..76faa35 100644
+index a8652bf..8b8710a 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1577,13 +1577,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1578,13 +1578,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
      sess->mackeylen = digest_key_length(ctx->digest->type);
      sess->mac = digest;
  
@@ -26,7 +26,7 @@ index 048e050..76faa35 100644
      return (1);
  }
  
-@@ -1623,6 +1616,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1624,6 +1617,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
  
  static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  {
@@ -34,7 +34,7 @@ index 048e050..76faa35 100644
      struct crypt_op cryp;
      struct dev_crypto_state *state = ctx->md_data;
      struct session_op *sess = &state->d_sess;
-@@ -1632,6 +1626,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1633,6 +1627,11 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
          return (0);
      }
  
@@ -46,7 +46,7 @@ index 048e050..76faa35 100644
      memset(&cryp, 0, sizeof(cryp));
  
      cryp.ses = sess->ses;
-@@ -1642,43 +1641,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1643,43 +1642,38 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  
      if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
          printf("cryptodev_digest_final: digest failed\n");
@@ -104,5 +104,5 @@ index 048e050..76faa35 100644
  
  static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
 -- 
-2.7.0
+2.7.3
 
index 03d1b96a36b975cda81349ca3cbcc2a7b3f29486..91bd4a45b6a4d9e4f2f787e050ce573c88906d79 100644 (file)
@@ -1,4 +1,4 @@
-From 3dd41691dc8162ec26d188269934689ad834894c Mon Sep 17 00:00:00 2001
+From 07f16d70cf7993c43e2c24a1e121c197db9ce1bc Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 15 Dec 2015 12:51:36 +0200
 Subject: [PATCH 28/48] cryptodev: fix debug print messages
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 76faa35..1585009 100644
+index 8b8710a..b74f21c 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1563,13 +1563,13 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1564,13 +1564,13 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
  
      digest = digest_nid_to_cryptodev(ctx->digest->type);
      if (digest == NID_undef) {
@@ -28,7 +28,7 @@ index 76faa35..1585009 100644
          return (0);
      }
  
-@@ -1586,7 +1586,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1587,7 +1587,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
      struct dev_crypto_state *state = ctx->md_data;
  
      if (!data || !count) {
@@ -37,7 +37,7 @@ index 76faa35..1585009 100644
          return 0;
      }
  
-@@ -1603,7 +1603,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1604,7 +1604,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
          state->mac_data =
              OPENSSL_realloc(state->mac_data, state->mac_len + count);
          if (!state->mac_data) {
@@ -46,7 +46,7 @@ index 76faa35..1585009 100644
              return (0);
          }
  
-@@ -1622,12 +1622,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1623,12 +1623,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
      struct session_op *sess = &state->d_sess;
  
      if (!md || state->d_fd < 0) {
@@ -61,7 +61,7 @@ index 76faa35..1585009 100644
          return (0);
      }
  
-@@ -1640,12 +1640,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1641,12 +1641,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
      cryp.mac = md;
  
      if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
@@ -76,7 +76,7 @@ index 76faa35..1585009 100644
      }
  
      return ret;
-@@ -1700,7 +1700,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
+@@ -1701,7 +1701,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
      if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) {
          put_dev_crypto(dstate->d_fd);
          dstate->d_fd = -1;
@@ -86,5 +86,5 @@ index 76faa35..1585009 100644
      }
  
 -- 
-2.7.0
+2.7.3
 
index 3dc2b92263215e22e5eb7441441dea9cdba96298..abf8084469eefb7ed31cc9549451e4fb58bc77d9 100644 (file)
@@ -1,4 +1,4 @@
-From 3fe44ab50a87106af3349148e81ec8a1d524de82 Mon Sep 17 00:00:00 2001
+From 64d5378080c14a9cf9fd673457af0fa80f3a94ee Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 15 Dec 2015 15:43:28 +0200
 Subject: [PATCH 29/48] cryptodev: use CIOCHASH ioctl for digest operations
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 11 insertions(+), 23 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 1585009..dc27b55 100644
+index b74f21c..4f375e0 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -84,6 +84,7 @@ struct dev_crypto_state {
+@@ -85,6 +85,7 @@ struct dev_crypto_state {
      unsigned char *iv;
      int ivlen;
  # ifdef USE_CRYPTODEV_DIGESTS
@@ -20,7 +20,7 @@ index 1585009..dc27b55 100644
      char dummy_mac_key[HASH_MAX_LEN];
      unsigned char digest_res[HASH_MAX_LEN];
      char *mac_data;
-@@ -1556,7 +1557,7 @@ static int digest_key_length(int nid)
+@@ -1557,7 +1558,7 @@ static int digest_key_length(int nid)
  static int cryptodev_digest_init(EVP_MD_CTX *ctx)
  {
      struct dev_crypto_state *state = ctx->md_data;
@@ -29,7 +29,7 @@ index 1585009..dc27b55 100644
      int digest;
  
      memset(state, 0, sizeof(struct dev_crypto_state));
-@@ -1573,9 +1574,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1574,9 +1575,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
          return (0);
      }
  
@@ -42,7 +42,7 @@ index 1585009..dc27b55 100644
  
      return (1);
  }
-@@ -1617,37 +1618,24 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1618,37 +1619,24 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
  static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  {
      int ret = 1;
@@ -87,5 +87,5 @@ index 1585009..dc27b55 100644
  }
  
 -- 
-2.7.0
+2.7.3
 
index 995a593f85b5fde7352a7f978b9c3f26383fa77d..28de5673fcf2930c55cc7a7cd02effd968b8e774 100644 (file)
@@ -1,4 +1,4 @@
-From 12fad710349bb72b7f95ee30b40c2e6dfbb5d373 Mon Sep 17 00:00:00 2001
+From 328b2890d5a9baf9f936bd9facaf411c01931f08 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Wed, 13 Jan 2016 15:18:20 +0200
 Subject: [PATCH 30/48] cryptodev: reduce duplicated efforts for searching
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 18 insertions(+), 26 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index dc27b55..30713e5 100644
+index 4f375e0..163a37d 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1533,37 +1533,31 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+@@ -1534,37 +1534,31 @@ cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
  
  # ifdef USE_CRYPTODEV_DIGESTS
  
@@ -64,7 +64,7 @@ index dc27b55..30713e5 100644
          printf("%s: Can't get digest\n", __func__);
          return (0);
      }
-@@ -1574,11 +1568,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
+@@ -1575,11 +1569,9 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
          return (0);
      }
  
@@ -77,7 +77,7 @@ index dc27b55..30713e5 100644
  }
  
  static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
-@@ -1668,7 +1660,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
+@@ -1669,7 +1661,7 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
      struct dev_crypto_state *fstate = from->md_data;
      struct dev_crypto_state *dstate = to->md_data;
      struct session_op *sess;
@@ -86,7 +86,7 @@ index dc27b55..30713e5 100644
  
      if (dstate == NULL || fstate == NULL)
          return 1;
-@@ -1677,11 +1669,11 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
+@@ -1678,11 +1670,11 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
  
      sess = &dstate->d_sess;
  
@@ -102,5 +102,5 @@ index dc27b55..30713e5 100644
      dstate->d_fd = get_dev_crypto();
  
 -- 
-2.7.0
+2.7.3
 
index fc23e0c1b263e7be626e95e7cb121159ffe42d78..d7af9cbd62af6ae3c85c488a670bc3fa49b86566 100644 (file)
@@ -1,4 +1,4 @@
-From 8cd09ffdfd7d9c25605401f1c0947b1b4acc6e57 Mon Sep 17 00:00:00 2001
+From 9faaca759390bba5aeeb049d31f74806e78137e1 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:00:22 +0200
 Subject: [PATCH 31/48] cryptodev: remove not used local variables
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 30713e5..2734500 100644
+index 163a37d..b13bf8c 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1634,7 +1634,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
+@@ -1635,7 +1635,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
  static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
  {
      struct dev_crypto_state *state = ctx->md_data;
@@ -20,7 +20,7 @@ index 30713e5..2734500 100644
  
      if (state == NULL) {
          return 0;
-@@ -3939,7 +3938,6 @@ static int cryptodev_dh_keygen(DH *dh)
+@@ -3952,7 +3951,6 @@ static int cryptodev_dh_keygen(DH *dh)
      int ret = 1, q_len = 0;
      unsigned char *q = NULL, *g = NULL, *s = NULL, *w = NULL;
      BIGNUM *pub_key = NULL, *priv_key = NULL;
@@ -28,7 +28,7 @@ index 30713e5..2734500 100644
  
      if (dh->priv_key)
          priv_key = dh->priv_key;
-@@ -4061,11 +4059,9 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
+@@ -4074,11 +4072,9 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
  {
      struct crypt_kop *kop = malloc(sizeof(struct crypt_kop));
      int ret = 1;
@@ -42,5 +42,5 @@ index 30713e5..2734500 100644
      kop->crk_op = CRK_DH_COMPUTE_KEY;
      /* inputs: dh->priv_key pub_key dh->p key */
 -- 
-2.7.0
+2.7.3
 
index 9ff4d361a92fba0559be543e9e23b7c79eaf0738..a53705f9cb95c8a89237147b8d028b620b28a4c3 100644 (file)
@@ -1,4 +1,4 @@
-From 335c80f847eacc573e10ba925b6a645963b16197 Mon Sep 17 00:00:00 2001
+From a6dc52cbcda9b4dcb0fda3b780e7c89219388982 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 17:22:49 +0200
 Subject: [PATCH 32/48] cryptodev: hide not used variable behind #ifndef
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 2734500..5a68c76 100644
+index b13bf8c..cdd99b8 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -412,7 +412,9 @@ static int open_dev_crypto(void)
+@@ -413,7 +413,9 @@ static int open_dev_crypto(void)
  static int get_dev_crypto(void)
  {
      static int fd = -1;
@@ -23,5 +23,5 @@ index 2734500..5a68c76 100644
      if (fd == -1)
          fd = open_dev_crypto();
 -- 
-2.7.0
+2.7.3
 
index 82ccebad56afaf88fa1433e87fd4d27471bbf6dd..f0863bdcd7cf34f0ee2f2097760cfebc6c25627d 100644 (file)
@@ -1,4 +1,4 @@
-From 03bdddf1495707119e4fa0eda385ecdccf66cbd8 Mon Sep 17 00:00:00 2001
+From 6d335627ec5bdf89c89ced9d2fa7610e6dc50e31 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:08:25 +0200
 Subject: [PATCH 33/48] cryptodev: fix function declaration typo
@@ -22,5 +22,5 @@ index f83ee73..c8efbe1 100644
  void ENGINE_set_check_pkc_availability(ENGINE *e,
        int (*check_pkc_availability)(int fd));
 -- 
-2.7.0
+2.7.3
 
index 84268c5802120a9abb5fda8a1d1cf7afebe38173..50aa45c83a0de9768af9c796d6cc4b4af59004a4 100644 (file)
@@ -1,4 +1,4 @@
-From 7012cf33a00618749319b1903f48ee3a35f5887b Mon Sep 17 00:00:00 2001
+From fcb63347ddb004825e05250fd082fe84ff3689df Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:12:54 +0200
 Subject: [PATCH 34/48] cryptodev: fix incorrect function signature
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 5a68c76..cec6938 100644
+index cdd99b8..1c71bc7 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -3148,7 +3148,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
+@@ -3161,7 +3161,7 @@ static ECDSA_SIG *cryptodev_ecdsa_do_sign(const unsigned char *dgst,
  }
  
  static int cryptodev_ecdsa_verify(const unsigned char *dgst, int dgst_len,
@@ -22,5 +22,5 @@ index 5a68c76..cec6938 100644
      BIGNUM *m = NULL, *p = NULL, *a = NULL, *b = NULL;
      BIGNUM *x = NULL, *y = NULL, *w_x = NULL, *w_y = NULL;
 -- 
-2.7.0
+2.7.3
 
index 0e90d82bd32d098c2e07cb88705427d2e9d2ad6a..e028f663855c1c43f719fa5b5ac64d1f2d4e212b 100644 (file)
@@ -1,4 +1,4 @@
-From 82612e3c4161ed6e10379841b953a0f56e557be4 Mon Sep 17 00:00:00 2001
+From 6ed8710043b5dc947afab8fffa80ea97f4c84ad6 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:21:46 +0200
 Subject: [PATCH 35/48] cryptodev: fix warnings on excess elements in struct
@@ -61,10 +61,10 @@ index 8584731..ab52add 100644
  
  struct dsa_st {
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index cec6938..407ea62 100644
+index 1c71bc7..20e1ec3 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2892,11 +2892,13 @@ static DSA_METHOD cryptodev_dsa = {
+@@ -2905,11 +2905,13 @@ static DSA_METHOD cryptodev_dsa = {
      NULL,
      NULL,
      NULL,
@@ -80,7 +80,7 @@ index cec6938..407ea62 100644
  };
  
  static ECDSA_METHOD cryptodev_ecdsa = {
-@@ -2906,7 +2908,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
+@@ -2919,7 +2921,6 @@ static ECDSA_METHOD cryptodev_ecdsa = {
      NULL,
      NULL,
      NULL,
@@ -88,7 +88,7 @@ index cec6938..407ea62 100644
      0,                          /* flags */
      NULL                        /* app_data */
  };
-@@ -4483,14 +4484,14 @@ static DH_METHOD cryptodev_dh = {
+@@ -4496,14 +4497,14 @@ static DH_METHOD cryptodev_dh = {
      NULL,
      NULL,
      0,                          /* flags */
@@ -106,5 +106,5 @@ index cec6938..407ea62 100644
      NULL                        /* app_data */
  };
 -- 
-2.7.0
+2.7.3
 
index 94b9f0f69dca713bdafa3a966a5eb30af2463a9a..e59744ed820afdf9a0dfb542f0ff39042231f691 100644 (file)
@@ -1,4 +1,4 @@
-From 8ccc9b12954b7eb299020a1b15d9d1e5735779df Mon Sep 17 00:00:00 2001
+From bf4e61a53459358185a73dffa5f79af9bd739149 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:36:33 +0200
 Subject: [PATCH 36/48] cryptodev: fix free on error path
@@ -29,10 +29,10 @@ index 9b28c04..c3843c6 100644
  # if 0
      int (*init) (EC_KEY *eckey);
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 407ea62..1b1fdc7 100644
+index 20e1ec3..1f13079 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -3424,7 +3424,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
+@@ -3437,7 +3437,7 @@ static int cryptodev_ecdsa_do_sign_async(const unsigned char *dgst,
      if (!(sig->r = BN_new()) || !kop)
          goto err;
      if ((sig->s = BN_new()) == NULL) {
@@ -42,5 +42,5 @@ index 407ea62..1b1fdc7 100644
      }
  
 -- 
-2.7.0
+2.7.3
 
index 2e9567b3e8b5940fbfe67cc1023933fe14e47aa8..ea1f4b2391ada95213849bf46a1fed3fdf00455e 100644 (file)
@@ -1,4 +1,4 @@
-From b3d3b86063e65b84ce53f4653295e3f6a83d5794 Mon Sep 17 00:00:00 2001
+From ec6b6531e3e67b4e82a4bc6829777052f39807b1 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 16:55:32 +0200
 Subject: [PATCH 37/48] cryptodev: fix return value on error
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 1b1fdc7..8cd3aa3 100644
+index 1f13079..b87fa7d 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2755,7 +2755,6 @@ cryptodev_dsa_do_sign_async(const unsigned char *dgst, int dlen, DSA *dsa,
+@@ -2768,7 +2768,6 @@ cryptodev_dsa_do_sign_async(const unsigned char *dgst, int dlen, DSA *dsa,
          sig->s = dsaret->s;
          /* Call user callback immediately */
          cookie->pkc_callback(cookie, 0);
@@ -24,5 +24,5 @@ index 1b1fdc7..8cd3aa3 100644
      return ret;
  }
 -- 
-2.7.0
+2.7.3
 
index 6e083bad972d5789c1274c00835f2e50913c0a3c..acd6e320f8f1c601f39fa4a7e6a444674c204b4e 100644 (file)
@@ -1,4 +1,4 @@
-From dcc3254b6dbb8627dd710fa58585542b98c80394 Mon Sep 17 00:00:00 2001
+From 77c84d99b5b0ab95efc9e1efc083e5cca8aa4eb5 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 17:11:43 +0200
 Subject: [PATCH 38/48] cryptodev: match types with cryptodev.h
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 8cd3aa3..4613d2d 100644
+index b87fa7d..4296704 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -85,9 +85,9 @@ struct dev_crypto_state {
+@@ -86,9 +86,9 @@ struct dev_crypto_state {
      int ivlen;
  # ifdef USE_CRYPTODEV_DIGESTS
      struct hash_op_data hash_op;
@@ -25,5 +25,5 @@ index 8cd3aa3..4613d2d 100644
  # endif
  };
 -- 
-2.7.0
+2.7.3
 
index 916c47e9dad5a5776c812ab6e53c9cb9b68a8f67..70319e4c2146c08dba9ac007e30da152e621e101 100644 (file)
@@ -1,4 +1,4 @@
-From 605210c8ae9241cad6c4ec071f5193bf3e83b2d4 Mon Sep 17 00:00:00 2001
+From 4366920bb2a97c10c49c5e6d035c0c82629b9f0a Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 17:15:25 +0200
 Subject: [PATCH 39/48] cryptodev: explicitly discard const qualifier
@@ -13,10 +13,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 4613d2d..2791ca3 100644
+index 4296704..f8619b0 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -1592,7 +1592,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
+@@ -1593,7 +1593,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data,
       * cryptodev calls and accumulating small amounts of data
       */
      if (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) {
@@ -26,5 +26,5 @@ index 4613d2d..2791ca3 100644
      } else {
          state->mac_data =
 -- 
-2.7.0
+2.7.3
 
index 2c61d9b889835096066bc23a1b20abd3b88251b7..c835967054ca2cb9b1279bdde44c02927efda9dc 100644 (file)
@@ -1,4 +1,4 @@
-From 45429e5ea075867f9219a6fcb233677d062a4451 Mon Sep 17 00:00:00 2001
+From f256bb9574f77206b289b265d1d46bb53e54c71c Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 11:28:23 +0200
 Subject: [PATCH 40/48] cryptodev: replace caddr_t with void *
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 2791ca3..f172173 100644
+index f8619b0..aac2740 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -460,8 +460,8 @@ static int get_cryptodev_ciphers(const int **cnids)
+@@ -461,8 +461,8 @@ static int get_cryptodev_ciphers(const int **cnids)
          return (0);
      }
      memset(&sess, 0, sizeof(sess));
@@ -26,7 +26,7 @@ index 2791ca3..f172173 100644
  
      for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
          if (ciphers[i].nid == NID_undef)
-@@ -501,7 +501,7 @@ static int get_cryptodev_digests(const int **cnids)
+@@ -502,7 +502,7 @@ static int get_cryptodev_digests(const int **cnids)
          return (0);
      }
      memset(&sess, 0, sizeof(sess));
@@ -35,7 +35,7 @@ index 2791ca3..f172173 100644
      for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
          if (digests[i].nid == NID_undef)
              continue;
-@@ -633,14 +633,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -634,14 +634,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      cryp.ses = sess->ses;
      cryp.flags = 0;
      cryp.len = inl;
@@ -53,7 +53,7 @@ index 2791ca3..f172173 100644
          if (!ctx->encrypt) {
              iiv = in + inl - ctx->cipher->iv_len;
              memcpy(save_iv, iiv, ctx->cipher->iv_len);
-@@ -701,15 +701,15 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+@@ -702,15 +702,15 @@ static int cryptodev_aead_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      }
      cryp.ses = sess->ses;
      cryp.len = state->len;
@@ -72,7 +72,7 @@ index 2791ca3..f172173 100644
          if (!ctx->encrypt) {
              iiv = in + len - ctx->cipher->iv_len;
              memcpy(save_iv, iiv, ctx->cipher->iv_len);
-@@ -761,7 +761,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+@@ -762,7 +762,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
      if ((state->d_fd = get_dev_crypto()) < 0)
          return (0);
  
@@ -81,7 +81,7 @@ index 2791ca3..f172173 100644
      sess->keylen = ctx->key_len;
      sess->cipher = cipher;
  
-@@ -804,7 +804,7 @@ static int cryptodev_init_aead_key(EVP_CIPHER_CTX *ctx,
+@@ -805,7 +805,7 @@ static int cryptodev_init_aead_key(EVP_CIPHER_CTX *ctx,
  
      memset(sess, 0, sizeof(struct session_op));
  
@@ -91,5 +91,5 @@ index 2791ca3..f172173 100644
      sess->cipher = cipher;
  
 -- 
-2.7.0
+2.7.3
 
index 552504548c90b37d6867c9415f084af2013364ec..6c46061e59c04083c0cf12387272428f9c8ef22d 100644 (file)
@@ -1,4 +1,4 @@
-From f10d471839dff079a23d79d1b4ecb3e3e6529283 Mon Sep 17 00:00:00 2001
+From c714cb7a33e994ff2278149d4a7a20a21215a2f6 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 17:04:25 +0200
 Subject: [PATCH 41/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index f172173..695848d 100644
+index aac2740..e419bef 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2054,12 +2054,24 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+@@ -2067,12 +2067,24 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
      kop.crk_status = 0;
      kop.crk_op = CRK_MOD_EXP_CRT;
      f_len = BN_num_bytes(rsa->n);
@@ -45,5 +45,5 @@ index f172173..695848d 100644
      kop.crk_param[0].crp_p = p;
      kop.crk_param[0].crp_nbits = p_len * 8;
 -- 
-2.7.0
+2.7.3
 
index 218accb181bccabb4f3c8fa38904be24f3dd8144..4b9b0862ba264dce16ea49ed0e774e5821e34ce4 100644 (file)
@@ -1,4 +1,4 @@
-From 402a2e4da471728fa537462d7a13aa35955cd6d8 Mon Sep 17 00:00:00 2001
+From 7f444e52acada23977b89d42f8dd8ebd915ccd83 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 11:47:52 +0200
 Subject: [PATCH 42/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 25 insertions(+), 8 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 695848d..8e84972 100644
+index e419bef..7c391d6 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -2109,25 +2109,42 @@ static int
+@@ -2122,25 +2122,42 @@ static int
  cryptodev_rsa_mod_exp_async(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
                              BN_CTX *ctx, struct pkc_cookie_s *cookie)
  {
@@ -65,5 +65,5 @@ index 695848d..8e84972 100644
      kop->crk_param[0].crp_p = p;
      kop->crk_param[0].crp_nbits = p_len * 8;
 -- 
-2.7.0
+2.7.3
 
index 931141de680bc0a240a0b91d5c443db2a3a6cf29..879d5c2cd334240f8c1e8a8c0b296ed96b4238da 100644 (file)
@@ -1,4 +1,4 @@
-From c8a5f714d35c3bd63d2511ad69e0661a7d1d5dcd Mon Sep 17 00:00:00 2001
+From 73115f243f0a65326888537f125e31f28c9f570d Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 11:53:22 +0200
 Subject: [PATCH 43/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 8e84972..55b2047 100644
+index 7c391d6..753e326 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -4043,11 +4043,15 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
+@@ -4056,11 +4056,15 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
      memset(&kop, 0, sizeof kop);
      kop.crk_op = CRK_DH_COMPUTE_KEY;
      /* inputs: dh->priv_key pub_key dh->p key */
@@ -33,7 +33,7 @@ index 8e84972..55b2047 100644
      kop.crk_param[1].crp_p = padded_pub_key;
      kop.crk_param[1].crp_nbits = p_len * 8;
      kop.crk_param[2].crp_p = p;
-@@ -4074,10 +4078,13 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
+@@ -4087,10 +4091,13 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
      kop.crk_param[3].crp_p = NULL;
      zapparams(&kop);
      return (dhret);
@@ -48,5 +48,5 @@ index 8e84972..55b2047 100644
      }
      return (dhret);
 -- 
-2.7.0
+2.7.3
 
index be996435804a1878204a26f0c3d7e34ef6144adb..37bdff8dddf8773b9edd0bc0910504e3934f62d3 100644 (file)
@@ -1,4 +1,4 @@
-From 42a1c45091ab7996c4411f3dd74539c908c63208 Mon Sep 17 00:00:00 2001
+From 0901ff383524e896424921f4e8a1ba7020e7613d Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 11:53:33 +0200
 Subject: [PATCH 44/48] cryptodev: check for errors inside
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 21 insertions(+), 8 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 55b2047..e0f9d4b 100644
+index 753e326..b9c7ff3 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -4095,19 +4095,28 @@ static int
+@@ -4108,19 +4108,28 @@ static int
  cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
                                 DH *dh, struct pkc_cookie_s *cookie)
  {
@@ -47,7 +47,7 @@ index 55b2047..e0f9d4b 100644
      kop->crk_param[1].crp_p = padded_pub_key;
      kop->crk_param[1].crp_nbits = p_len * 8;
      kop->crk_param[2].crp_p = p;
-@@ -4119,16 +4128,20 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
+@@ -4132,16 +4141,20 @@ cryptodev_dh_compute_key_async(unsigned char *key, const BIGNUM *pub_key,
      kop->crk_param[3].crp_nbits = p_len * 8;
      kop->crk_oparams = 1;
  
@@ -72,5 +72,5 @@ index 55b2047..e0f9d4b 100644
          /* Call user cookie handler */
          cookie->pkc_callback(cookie, 0);
 -- 
-2.7.0
+2.7.3
 
index 11f1a54119d5469893d1f40f600db05f7789147a..4489b435e851d95c0dcea61ddbfe72a1163ec578 100644 (file)
@@ -1,4 +1,4 @@
-From 528e4965e536d31cdccb11abe5e04db28a1008a8 Mon Sep 17 00:00:00 2001
+From 6ca53b6d6519d52021e642230bb51ae7834b3e67 Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 12:11:32 +0200
 Subject: [PATCH 45/48] cryptodev: change signature for conversion functions
@@ -12,10 +12,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index e0f9d4b..3024a68 100644
+index b9c7ff3..58e539c 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -145,7 +145,7 @@ const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha1;
+@@ -146,7 +146,7 @@ const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha1;
  const EVP_CIPHER cryptodev_tls12_aes_128_cbc_hmac_sha256;
  const EVP_CIPHER cryptodev_tls12_aes_256_cbc_hmac_sha256;
  
@@ -24,7 +24,7 @@ index e0f9d4b..3024a68 100644
  {
      int len;
      unsigned char *p;
-@@ -167,7 +167,7 @@ inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
+@@ -168,7 +168,7 @@ inline int spcf_bn2bin(BIGNUM *bn, unsigned char **bin, int *bin_len)
      return 0;
  }
  
@@ -34,5 +34,5 @@ index e0f9d4b..3024a68 100644
      int len;
      unsigned char *p;
 -- 
-2.7.0
+2.7.3
 
index e7a5aa32fe7e864521e5905b1eda8c1441d13601..d8b56dee0c0d18bd728f6480eb5508a8a31e72f4 100644 (file)
@@ -1,4 +1,4 @@
-From b27823ac9f460c96a72d9003e2e134c1288ac85f Mon Sep 17 00:00:00 2001
+From 8f6e948f5f6bb2b517a5436dd6294e7e5536cf8f Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Tue, 9 Feb 2016 12:13:59 +0200
 Subject: [PATCH 46/48] cryptodev: add explicit cast for known BIGNUM values
@@ -9,10 +9,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 3024a68..539be62 100644
+index 58e539c..ddd3462 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -4014,7 +4014,7 @@ static int cryptodev_dh_keygen(DH *dh)
+@@ -4027,7 +4027,7 @@ static int cryptodev_dh_keygen(DH *dh)
      }
  
      /* pub_key is or prime length while priv key is of length of order */
@@ -22,5 +22,5 @@ index 3024a68..539be62 100644
  
      dh->pub_key = BN_bin2bn(w, q_len, pub_key);
 -- 
-2.7.0
+2.7.3
 
index 2163998bd74b4af52491404c1ab8d794f6fed59f..7cfad9cd7b507e1579f707725e37298cfc66dfae 100644 (file)
@@ -1,4 +1,4 @@
-From 596735ad86a3dae987e19c21ef22259179966fc6 Mon Sep 17 00:00:00 2001
+From e50560cb9a201c0b0130bb29d4c99121a8ec97ba Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Mon, 8 Feb 2016 15:15:02 +0200
 Subject: [PATCH 47/48] cryptodev: treat all build warnings as errors
@@ -24,5 +24,5 @@ index 426388e..010f21d 100644
  GENERAL=Makefile
  TEST= enginetest.c
 -- 
-2.7.0
+2.7.3
 
index d7b84e6ab207ac7c247f97f4058d05b4f8a48be8..57ff7f11be0d3a6c1ed7e8d6bc3766caf5bbe214 100644 (file)
@@ -1,4 +1,4 @@
-From 116bd4f6f1ee5acdb997d414902d9646b24df1be Mon Sep 17 00:00:00 2001
+From c79e7a4a818ea86bf6045197173d5c4e243d1f4f Mon Sep 17 00:00:00 2001
 From: Cristian Stoica <cristian.stoica@nxp.com>
 Date: Wed, 6 Apr 2016 15:22:58 +0300
 Subject: [PATCH 48/48] fix 'maclen is used uninitialized' warning on some
@@ -10,10 +10,10 @@ Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
-index 539be62..35b71b0 100644
+index ddd3462..2266b26 100644
 --- a/crypto/engine/eng_cryptodev.c
 +++ b/crypto/engine/eng_cryptodev.c
-@@ -905,6 +905,10 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
+@@ -906,6 +906,10 @@ static int cryptodev_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
                  maclen = SHA256_DIGEST_LENGTH;
                  aad_needs_fix = true;
                  break;
@@ -25,5 +25,5 @@ index 539be62..35b71b0 100644
  
              /* Correct length for AAD Length field */
 -- 
-2.7.0
+2.7.3
 
similarity index 82%
rename from recipes-connectivity/openssl/openssl-qoriq_1.0.2h.bb
rename to recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb
index 1c66fb97ec4b02044636c5b8b96cb53eea093a5a..9ba150ad679a819b7a4c9ca5e12d807929f89c6e 100644 (file)
@@ -1,50 +1,34 @@
 require openssl-qoriq.inc
 
-DISABLE_STATIC = ""
-RRECOMMENDS_libcrypto += "cryptodev-module"
-COMPATIBLE_MACHINE = "(qoriq)"
 
-# For target side versions of openssl enable support for OCF Linux driver
-# if they are available.
+DISABLE_STATIC = ""
 DEPENDS += "cryptodev-linux"
-
+RRECOMMENDS_libcrypto += "cryptodev-module"
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
+COMPATIBLE_MACHINE = "(qoriq)"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"
 
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
 
-SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \
+SRC_URI += "file://find.pl \
             file://run-ptest \
-            file://openssl-c_rehash.sh \
             file://configure-targets.patch \
             file://shared-libs.patch \
             file://oe-ldflags.patch \
             file://engines-install-in-libdir-ssl.patch \
             file://debian1.0.2/block_diginotar.patch \
             file://debian1.0.2/block_digicert_malaysia.patch \
-            file://debian/ca.patch \
-            file://debian/c_rehash-compat.patch \
-            file://debian/debian-targets.patch \
-            file://debian/man-dir.patch \
-            file://debian/man-section.patch \
-            file://debian/no-rpath.patch \
-            file://debian/no-symbolic.patch \
-            file://debian/pic.patch \
-            file://debian1.0.2/version-script.patch \
+            file://no-rpath.patch \
             file://openssl_fix_for_x32.patch \
             file://fix-cipher-des-ede3-cfb1.patch \
-            file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
             file://openssl-fix-des.pod-error.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
+            file://crypto_use_bigint_in_x86-64_perl.patch \
             file://openssl-1.0.2a-x32-asm.patch \
             file://ptest_makefile_deps.patch  \
-            file://configure-musl-target.patch \
-            file://parallel.patch \
-            file://CVE-2016-2177.patch \
-            file://CVE-2016-2178.patch \
            "
 SRC_URI += "file://0001-remove-double-initialization-of-cryptodev-engine.patch \
        file://0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \
@@ -96,11 +80,16 @@ SRC_URI += "file://0001-remove-double-initialization-of-cryptodev-engine.patch \
        file://0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch \
 "
 
-SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"
-SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
+SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
+SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
+
+PACKAGES =+ " \
+       ${PN}-engines \
+       ${PN}-engines-dbg \
+       "
 
-PACKAGES =+ "${PN}-engines"
 FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
+FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
 
 # The crypto_use_bigint patch means that perl's bignum module needs to be
 # installed, but some distributions (for example Fedora 23) don't ship it by
@@ -110,4 +99,5 @@ do_configure_prepend() {
        if ! perl -Mbigint -e true; then
                bbfatal "The perl module 'bignum' was not found but this is required to build openssl.  Please install this module (often packaged as perl-bignum) and re-run bitbake."
        fi
+       cp ${WORKDIR}/find.pl ${S}/util/find.pl
 }