diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-09-29 17:08:25 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-09-29 17:08:25 +0000 |
| commit | 7459a281dc81f573246d99b0f863ef0065e4e6ad (patch) | |
| tree | 2c14f30e3e3c8f40efa795631427a6a795b34d65 /cpp/src/IceSSL/RSACertificateGen.cpp | |
| parent | minor changes for gcc 3.2 (diff) | |
| download | ice-7459a281dc81f573246d99b0f863ef0065e4e6ad.tar.bz2 ice-7459a281dc81f573246d99b0f863ef0065e4e6ad.tar.xz ice-7459a281dc81f573246d99b0f863ef0065e4e6ad.zip | |
lots and lots of fixes
Diffstat (limited to 'cpp/src/IceSSL/RSACertificateGen.cpp')
| -rw-r--r-- | cpp/src/IceSSL/RSACertificateGen.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index 600b4e386e4..d3edd8b21cf 100644 --- a/cpp/src/IceSSL/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -22,6 +22,17 @@ using std::string; using std::back_inserter; +IceSSL::RSACertificateGenContext::RSACertificateGenContext() : + _modulusLength(0), + _secondsValid(0), + _issuedAdjustment(0) +{ +} + +IceSSL::RSACertificateGenContext::~RSACertificateGenContext() +{ +} + long IceSSL::RSACertificateGenContext::minutesToSeconds(long minutes) { @@ -52,17 +63,6 @@ IceSSL::RSACertificateGenContext::yearsToSeconds(long years) return weeksToSeconds(years * 365L); } -IceSSL::RSACertificateGenContext::RSACertificateGenContext() : - _modulusLength(0), - _secondsValid(0), - _issuedAdjustment(0) -{ -} - -IceSSL::RSACertificateGenContext::~RSACertificateGenContext() -{ -} - void IceSSL::RSACertificateGenContext::setCountry(const string& country) { @@ -158,7 +158,7 @@ IceSSL::RSACertificateGenContext::getOrganization() const } unsigned char* -IceSSL::RSACertificateGenContext::getOrgainizationalUnit() const +IceSSL::RSACertificateGenContext::getOrganizationalUnit() const { unsigned char* orgUnit = reinterpret_cast<unsigned char *>(const_cast<char*>(_organizationalUnit.c_str())); @@ -248,12 +248,12 @@ 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, "C", MBSTRING_ASC, context.getCountry(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, "ST", MBSTRING_ASC, context.getStateProvince(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, "L", MBSTRING_ASC, context.getLocality(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, "O", MBSTRING_ASC, context.getOrganization(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, "OU", MBSTRING_ASC, context.getOrgainizationalUnit(), -1, -1, 0); - X509_NAME_add_entry_by_txt(subjectName, "CN", MBSTRING_ASC, context.getCommonName(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "C", MBSTRING_ASC, context.getCountry(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "ST", MBSTRING_ASC, context.getStateProvince(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "L", MBSTRING_ASC, context.getLocality(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "O", MBSTRING_ASC, context.getOrganization(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "OU", MBSTRING_ASC, context.getOrganizationalUnit(), -1, -1, 0); + X509_NAME_add_entry_by_txt(subjectName, "CN", MBSTRING_ASC, context.getCommonName(), -1, -1, 0); // Self signed - set issuer and subject names identical X509_set_issuer_name(x509SelfSigned, subjectName); |