diff options
| author | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-04 21:00:52 +0000 |
|---|---|---|
| committer | johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-06-04 21:00:52 +0000 |
| commit | 25ba3700f75e719bd254705e477dc4a47cb17a7f (patch) | |
| tree | 4ac6da88473a454e7a465972ea5822b6f966a06a | |
| parent | 904c74eb236e43b456690e96280ce35e54f69f93 (diff) | |
| download | ATCD-25ba3700f75e719bd254705e477dc4a47cb17a7f.tar.gz | |
ChangeLogTag: Wed Jun 4 20:59:16 UTC 2008 Ciju John <johnc at ociweb dot com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 45e0491ad2c..15e040d29f9 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 4 20:59:16 UTC 2008 Ciju John <johnc at ociweb dot com> + + * ace/SSL/SSL_Context.cpp: + Fix for Bug 3337. ::SSL_add_dir_cert_subjects_to_stack() isn't + ready for Windows. + Wed Jun 4 17:12:10 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> * ace/ACE.cpp (timestamp): diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 158f42e80d8..7f6df47125b 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -378,6 +378,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, // this comparison if so. #if defined (OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090801fL) # if !defined (OPENSSL_SYS_VMS) && !defined (OPENSSL_SYS_MACINTOSH_CLASSIC) +# if !defined (OPENSSL_SYS_WIN32) || (OPENSSL_VERSION_NUMBER > 0x0090807fL) if (ca_dir != 0) { @@ -398,6 +399,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, return -1; } } +# endif /* !OPENSSL_SYS_WIN32 || OPENSSL_VERSION_NUMBER >= 0x0090807fL */ # endif /* !OPENSSL_SYS_VMS && !OPENSSL_SYS_MACINTOSH_CLASSIC */ #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8a release */ |