Import upstream version 0.8

23 files changed, 3 insertions, 3 deletions

diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_all.c b/Cryptlib/OpenSSL/crypto/engine/eng_all.c
index f29c167c..8a1b9c7c 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_all.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_all.c
@@ -102,14 +102,14 @@ void ENGINE_load_builtin_engines(void)
 #if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
 	ENGINE_load_gmp();
 #endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+	ENGINE_load_capi();
+#endif
 #endif
 #ifndef OPENSSL_NO_HW
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 	ENGINE_load_cryptodev();
 #endif
-#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
-	ENGINE_load_capi();
-#endif
 #endif
 	}
 
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_cnf.c b/Cryptlib/OpenSSL/crypto/engine/eng_cnf.c
index 95c40700..95c40700 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_cnf.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_cnf.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_cryptodev.c b/Cryptlib/OpenSSL/crypto/engine/eng_cryptodev.c
index eef1e2d8..eef1e2d8 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_cryptodev.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_cryptodev.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_ctrl.c b/Cryptlib/OpenSSL/crypto/engine/eng_ctrl.c
index 5ce25d92..5ce25d92 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_ctrl.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_ctrl.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_dyn.c b/Cryptlib/OpenSSL/crypto/engine/eng_dyn.c
index acb30c34..acb30c34 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_dyn.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_dyn.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_err.c b/Cryptlib/OpenSSL/crypto/engine/eng_err.c
index ac74dd12..ac74dd12 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_err.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_err.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_fat.c b/Cryptlib/OpenSSL/crypto/engine/eng_fat.c
index 27c1662f..27c1662f 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_fat.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_fat.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_init.c b/Cryptlib/OpenSSL/crypto/engine/eng_init.c
index 7633cf5f..7633cf5f 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_init.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_init.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_lib.c b/Cryptlib/OpenSSL/crypto/engine/eng_lib.c
index 5815b867..5815b867 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_lib.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_lib.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_list.c b/Cryptlib/OpenSSL/crypto/engine/eng_list.c
index fa2ab973..fa2ab973 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_list.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_list.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c b/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
index 7c139ae2..7c139ae2 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_padlock.c b/Cryptlib/OpenSSL/crypto/engine/eng_padlock.c
index 743558ab..743558ab 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_padlock.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_padlock.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_pkey.c b/Cryptlib/OpenSSL/crypto/engine/eng_pkey.c
index 1dfa2e36..1dfa2e36 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_pkey.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_pkey.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_table.c b/Cryptlib/OpenSSL/crypto/engine/eng_table.c
index 8fc47b33..8fc47b33 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/eng_table.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_table.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_cipher.c b/Cryptlib/OpenSSL/crypto/engine/tb_cipher.c
index 177fc1fb..177fc1fb 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_cipher.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_cipher.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_dh.c b/Cryptlib/OpenSSL/crypto/engine/tb_dh.c
index 6e9d4287..6e9d4287 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_dh.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_dh.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_digest.c b/Cryptlib/OpenSSL/crypto/engine/tb_digest.c
index d3f4bb27..d3f4bb27 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_digest.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_digest.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_dsa.c b/Cryptlib/OpenSSL/crypto/engine/tb_dsa.c
index e4674f5f..e4674f5f 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_dsa.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_dsa.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_ecdh.c b/Cryptlib/OpenSSL/crypto/engine/tb_ecdh.c
index c8ec7812..c8ec7812 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_ecdh.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_ecdh.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_ecdsa.c b/Cryptlib/OpenSSL/crypto/engine/tb_ecdsa.c
index 005ecb62..005ecb62 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_ecdsa.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_ecdsa.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_rand.c b/Cryptlib/OpenSSL/crypto/engine/tb_rand.c
index f36f67c0..f36f67c0 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_rand.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_rand.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_rsa.c b/Cryptlib/OpenSSL/crypto/engine/tb_rsa.c
index fbc707fd..fbc707fd 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_rsa.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_rsa.c
diff --git a/Cryptlib/OpenSSL/crypto/engine/tb_store.c b/Cryptlib/OpenSSL/crypto/engine/tb_store.c
index 8cc435c9..8cc435c9 100755..100644
--- a/Cryptlib/OpenSSL/crypto/engine/tb_store.c
+++ b/Cryptlib/OpenSSL/crypto/engine/tb_store.c