summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-01-14 14:10:19 +0000
committervzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-01-14 14:10:19 +0000
commit83c37b91831b80e00f281b9f9f9277e0c7d82651 (patch)
treee90feb842661432dee8a423cc2f4fca6315f383c
parent32d458d15b843399ea58be49db7dec591d6c3f63 (diff)
downloadATCD-83c37b91831b80e00f281b9f9f9277e0c7d82651.tar.gz
ChangeLogTag: Mon Jan 14 14:02:44 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp3
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dd314bea9dc..63813940b32 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 14 14:02:44 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp:
+ Changed a bit a fix for bug 3165. It happens that ASN1_INTEGER_to_BN
+ unconditionally allocates BIGNUM and thus that BIGNUM has to be
+ freed unconditionally too.
+
Mon Jan 14 01:04:17 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>
* TAO_IDL/TAO_IDL.mwc:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index c4763bb1a25..1b6a4d0ede2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -37,8 +37,6 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
{
char * id = BN_bn2hex (bn);
- BN_free(bn);
-
ACE_CString s =
ACE_CString ("X509: ")
+ ACE_CString (const_cast<const char *> (id));
@@ -53,6 +51,7 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp)
CRYPTO_free (id);
#endif /* OPENSSL_free */
}
+ BN_free (bn);
// -------------------------------------------