summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2002-05-03 15:39:54 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2002-05-03 15:39:54 +0000
commit1897dd9cc494ea85df54dab86dddf2768072cfa5 (patch)
tree178d54326a63d8af2c1d35db6ad786666d39a177
parentddc5631df5d8a0ce915fb34fdeb89959eb34f42c (diff)
downloadATCD-1897dd9cc494ea85df54dab86dddf2768072cfa5.tar.gz
ChangeLogTag:Fri May 03 08:38:27 2002 Ossama Othman <ossama@uci.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLogs/ChangeLog-02a8
-rw-r--r--ChangeLogs/ChangeLog-03a8
-rw-r--r--ace/SSL/SSL_Context.cpp5
4 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 83f937d04b0..7f559766c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri May 03 08:38:27 2002 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Context.cpp (ssl_library_init):
+
+ Removed extraneous "SSL_library_init()" call.
+ SSLeay_add_ssl_algorithms(), which is an alias for
+ SSL_library_init(), is already called.
+
Thu May 02 16:33:05 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/OS.i (mmap): On Win32, check for both ERROR_INVALID_NAME and
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 83f937d04b0..7f559766c4e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Fri May 03 08:38:27 2002 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Context.cpp (ssl_library_init):
+
+ Removed extraneous "SSL_library_init()" call.
+ SSLeay_add_ssl_algorithms(), which is an alias for
+ SSL_library_init(), is already called.
+
Thu May 02 16:33:05 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/OS.i (mmap): On Win32, check for both ERROR_INVALID_NAME and
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 83f937d04b0..7f559766c4e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Fri May 03 08:38:27 2002 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Context.cpp (ssl_library_init):
+
+ Removed extraneous "SSL_library_init()" call.
+ SSLeay_add_ssl_algorithms(), which is an alias for
+ SSL_library_init(), is already called.
+
Thu May 02 16:33:05 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/OS.i (mmap): On Win32, check for both ERROR_INVALID_NAME and
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp
index 05457fb23fc..4e93854c2a5 100644
--- a/ace/SSL/SSL_Context.cpp
+++ b/ace/SSL/SSL_Context.cpp
@@ -84,11 +84,8 @@ ACE_SSL_Context::ssl_library_init (void)
::CRYPTO_set_locking_callback (ACE_SSL_locking_callback);
#endif /* ACE_HAS_THREADS */
-
- ::SSL_library_init ();
- ::SSL_load_error_strings ();
::SSLeay_add_ssl_algorithms ();
-
+ ::SSL_load_error_strings ();
// Seed the random number generator. Note that the random
// number generator can be seeded more than once to "stir" its