diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp index 020904b53d2..9ed92d48a82 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- -#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h" +#include "SSLIOP_EVP_PKEY.h" #include <openssl/x509.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/dh.h> -#include "orbsvcs/SSLIOP/params_dup.h" +#include "params_dup.h" ACE_RCSID (SSLIOP, @@ -14,8 +14,6 @@ ACE_RCSID (SSLIOP, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ::EVP_PKEY * TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) { @@ -47,7 +45,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) if (dsa != 0) { // Not exception safe! - ::EVP_PKEY_set1_DSA (p.in (), DSAPARAMS_DUP_WRAPPER_NAME (dsa)); + ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa)); ::DSA_free (dsa); } } @@ -59,7 +57,7 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) if (dh != 0) { // Not exception safe! - ::EVP_PKEY_set1_DH (p.in (), DHPARAMS_DUP_WRAPPER_NAME (dh)); + ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh)); ::DH_free (dh); } } @@ -73,4 +71,3 @@ TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key) return p._retn (); } -TAO_END_VERSIONED_NAMESPACE_DECL |