diff options
| author | Anthony Neal <aneal@zeroc.com> | 2003-12-12 16:48:27 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2003-12-12 16:48:27 +0000 |
| commit | 08c9a04f60fc6dd34c8c1508b0afb603e47d1f36 (patch) | |
| tree | 17a638307333c15224e59db1446e339d852b5927 /cpp/src/IceSSL/RSACertificateGen.cpp | |
| parent | fixes (diff) | |
| download | ice-08c9a04f60fc6dd34c8c1508b0afb603e47d1f36.tar.bz2 ice-08c9a04f60fc6dd34c8c1508b0afb603e47d1f36.tar.xz ice-08c9a04f60fc6dd34c8c1508b0afb603e47d1f36.zip | |
Modifications made to:
Add additional cleanup processing on Plugin destruction.
Add IceSSL.MemoryDebug messages.
Diffstat (limited to 'cpp/src/IceSSL/RSACertificateGen.cpp')
| -rw-r--r-- | cpp/src/IceSSL/RSACertificateGen.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index d55a09631f9..1564b262583 100644 --- a/cpp/src/IceSSL/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -252,12 +252,18 @@ IceSSL::RSACertificateGen::generate(const RSACertificateGenContext& context) X509_gmtime_adj(X509_get_notAfter(x509SelfSigned), context.getSecondsValid()); // Set up subject/issuer Distinguished Name (DN). - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("C"), MBSTRING_ASC, context.getCountry(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("ST"), MBSTRING_ASC, context.getStateProvince(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("L"), MBSTRING_ASC, context.getLocality(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("O"), MBSTRING_ASC, context.getOrganization(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("OU"), MBSTRING_ASC, context.getOrganizationalUnit(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("CN"), MBSTRING_ASC, context.getCommonName(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("C"), MBSTRING_ASC, context.getCountry(), + -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("ST"), MBSTRING_ASC, context.getStateProvince(), + -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("L"), MBSTRING_ASC, context.getLocality(), + -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("O"), MBSTRING_ASC, context.getOrganization(), + -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("OU"), MBSTRING_ASC, context.getOrganizationalUnit(), + -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, const_cast<char*>("CN"), MBSTRING_ASC, context.getCommonName(), + -1, -1, 0); // Self signed - set issuer and subject names identical X509_set_issuer_name(x509SelfSigned, subjectName); @@ -279,6 +285,7 @@ IceSSL::RSACertificateGen::generate(const RSACertificateGenContext& context) } // Nasty Hack: Getting the pkey to let go of our rsaKeyPair - we own that now. + // Checked this out, though, and there are no current issues (0.9.7a) with doing this. pkey->pkey.ptr = 0; RSAPrivateKeyPtr privKeyPtr = new RSAPrivateKey(rsaKeyPair); |