Author: mcalmer
Date: Fri Aug 13 14:52:46 2010
New Revision: 2696
URL: http://svn.opensuse.org/viewcvs/limal?rev=2696&view=rev
Log:
use exec without stdin; use config file for DN values
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp
limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/RequestTest.out
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Fri Aug 13 14:52:46 2010
@@ -337,6 +337,27 @@
// copy Section, because "req" is hard coded in openssl :-(
m_impl->config->copySection(type2Section(requestType, false), "req");
+ //write request distinguished_name values to config
+ requestData.getSubjectDN().commit2Config(*this, requestType);
+ m_impl->config->setValue("req", "distinguished_name", "req_distinguished_name_val");
+ // required to read the DN values directly from the config file
+ m_impl->config->setValue("req", "prompt", "no");
+ if(!(requestData.getChallengePassword().empty() && requestData.getUnstructuredName().empty()))
+ {
+ m_impl->config->setValue("req", "attributes", "req_attributes_val");
+ if(!requestData.getChallengePassword().empty())
+ {
+ m_impl->config->setValue("req_attributes_val", "challengePassword", requestData.getChallengePassword());
+ }
+ if(!requestData.getUnstructuredName().empty())
+ {
+ m_impl->config->setValue("req_attributes_val", "unstructuredName", requestData.getUnstructuredName());
+ }
+ }
+ else
+ {
+ m_impl->config->deleteValue("req", "attributes");
+ }
// create key
ost.createRSAKey(m_impl->repositoryDir + "/" + m_impl->caName + "/keys/"+ request + ".key",
@@ -345,18 +366,21 @@
// create request
- ost.createRequest(requestData.getSubjectDN(),
- m_impl->repositoryDir + "/" + m_impl->caName + "/req/"+ request + ".req",
+ ost.createRequest(m_impl->repositoryDir + "/" + m_impl->caName + "/req/"+ request + ".req",
m_impl->repositoryDir + "/" + m_impl->caName + "/keys/"+ request + ".key",
keyPasswd,
type2Section(requestType, true),
- E_PEM,
- requestData.getChallengePassword(),
- requestData.getUnstructuredName());
+ E_PEM);
OpenSSLUtils::addCAM(m_impl->caName, request, opensslDN, m_impl->repositoryDir);
+ // restore req_distinguished_name section
+ m_impl->config->deleteSection("req_distinguished_name_val");
+ m_impl->config->deleteSection("req_attributes_val");
+ m_impl->config->setValue("req", "attributes", "req_attributes");
+ m_impl->config->setValue("req", "distinguished_name", "req_distinguished_name");
+
return request;
}
@@ -1175,17 +1199,40 @@
// copy Section, because "req" is hard coded in openssl :-(
tmpCA.getConfig()->copySection(type2Section(E_CA_Req, false), "req");
+ //write request distinguished_name values to config
+ caRequestData.getSubjectDN().commit2Config(tmpCA, E_CA_Req);
+ tmpCA.getConfig()->setValue("req", "distinguished_name", "req_distinguished_name_val");
+ // required to read the DN values directly from the config file
+ tmpCA.getConfig()->setValue("req", "prompt", "no");
+ if(!(caRequestData.getChallengePassword().empty() && caRequestData.getUnstructuredName().empty()))
+ {
+ tmpCA.getConfig()->setValue("req", "attributes", "req_attributes_val");
+ if(!caRequestData.getChallengePassword().empty())
+ {
+ tmpCA.getConfig()->setValue("req_attributes_val", "challengePassword", caRequestData.getChallengePassword());
+ }
+ if(!caRequestData.getUnstructuredName().empty())
+ {
+ tmpCA.getConfig()->setValue("req_attributes_val", "unstructuredName", caRequestData.getUnstructuredName());
+ }
+ }
+ else
+ {
+ tmpCA.getConfig()->deleteValue("req", "attributes");
+ }
+
OpenSSLUtils ost(configFilename);
// create request
- ost.createRequest(caRequestData.getSubjectDN(),
- repos + "/" + caName + "/" + "cacert.req",
+ ost.createRequest(repos + "/" + caName + "/" + "cacert.req",
repos + "/" + caName + "/" + "cacert.key",
- caPasswd,
- "v3_req_ca",
- E_PEM,
- caRequestData.getChallengePassword(),
- caRequestData.getUnstructuredName());
+ caPasswd, "v3_req_ca", E_PEM);
+
+ // restore req_distinguished_name section
+ tmpCA.getConfig()->deleteSection("req_distinguished_name_val");
+ tmpCA.getConfig()->deleteSection("req_attributes_val");
+ tmpCA.getConfig()->setValue("req", "attributes", "req_attributes");
+ tmpCA.getConfig()->setValue("req", "distinguished_name", "req_distinguished_name");
// write certificate issue data to config
caIssueData.commit2Config(tmpCA, E_CA_Cert);
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CAConfig.cpp Fri Aug 13 14:52:46 2010
@@ -183,6 +183,18 @@
}
}
+void
+CAConfig::deleteSection(const std::string §ion)
+{
+ if (m_impl->parser.iniFile.contains (section) == SECTION)
+ {
+ // delete entry
+ m_impl->parser.iniFile.delSection (section);
+ // and save
+ m_impl->parser.write();
+ }
+}
+
std::string
CAConfig::getValue(const std::string §ion, const std::string &key) const
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/DNObject.cpp Fri Aug 13 14:52:46 2010
@@ -20,6 +20,7 @@
/-*/
+#include
#include
#include
#include
@@ -72,6 +73,36 @@
}
std::string
+RDNObject::getOpenSSLType() const
+{
+ std::map opensslKeys;
+ opensslKeys["countryName"] = "C";
+ opensslKeys["stateOrProvinceName"] = "ST";
+ opensslKeys["localityName"] = "L";
+ opensslKeys["organizationName"] = "O";
+ opensslKeys["organizationalUnitName"] = "OU";
+ opensslKeys["commonName"] = "CN";
+ opensslKeys["emailAddress"] = "emailAddress";
+ //opensslKeys[""] = "";
+
+ std::string ret;
+ std::map::const_iterator it = opensslKeys.find(m_impl->type);
+
+ if( it != opensslKeys.end())
+ {
+ ret = (*it).second;
+ }
+ else
+ {
+ LOGIT_ERROR("Invalid type:" << m_impl->type);
+ CA_MGM_THROW(ca_mgm::ValueException,
+ // %s is the invalid string for a DN type
+ str::form(__("Invalid type %s."), m_impl->type.c_str()).c_str());
+ }
+ return ret;
+}
+
+std::string
RDNObject::getValue() const
{
return m_impl->value;
@@ -80,42 +111,17 @@
std::string
RDNObject::getOpenSSLValue() const
{
- if(m_impl->value.empty()) return std::string();
-
- std::map opensslKeys;
- opensslKeys["countryName"] = "C";
- opensslKeys["stateOrProvinceName"] = "ST";
- opensslKeys["localityName"] = "L";
- opensslKeys["organizationName"] = "O";
- opensslKeys["organizationalUnitName"] = "OU";
- opensslKeys["commonName"] = "CN";
- opensslKeys["emailAddress"] = "emailAddress";
- //opensslKeys[""] = "";
+ if(m_impl->value.empty()) return std::string();
- std::string ret;
- std::map::const_iterator it = opensslKeys.find(m_impl->type);
-
- if( it != opensslKeys.end())
- {
- ret += (*it).second + "=";
- }
- else
- {
- LOGIT_ERROR("Invalid type:" << m_impl->type);
- CA_MGM_THROW(ca_mgm::ValueException,
- // %s is the invalid string for a DN type
- str::form(__("Invalid type %s."), m_impl->type.c_str()).c_str());
- }
+ std::string ret = getOpenSSLType();
- //PosixRegEx regex("([\\\\/])");
- //std::string v = regex.replace(m_impl->value, "\\1", true);
- std::string v = str::escape(m_impl->value, '\\');
- v = str::escape(v, '/');
- //LOGIT_DEBUG("RDNObject::getOpenSSLValue Value: '" << m_impl->value << "' quoted: '" << v << "'");
+ std::string v = str::escape(m_impl->value, '\\');
+ v = str::escape(v, '/');
+ //LOGIT_DEBUG("RDNObject::getOpenSSLValue Value: '" << m_impl->value << "' quoted: '" << v << "'");
- ret += v;
+ ret += "=" + v;
- return ret;
+ return ret;
}
bool
@@ -484,4 +490,25 @@
return result;
}
+void
+DNObject::commit2Config(CA& ca, Type type) const
+{
+ if(!(type == E_Client_Req || type == E_Server_Req || E_CA_Req) )
+ {
+ LOGIT_ERROR("wrong type" << type);
+ CA_MGM_THROW(ca_mgm::ValueException,
+ str::form(__("Wrong type: %1."), type).c_str());
+ }
+
+ ca.getConfig()->deleteSection("req_distinguished_name_val");
+ std::list< RDNObject >::const_iterator it = m_impl->dn.begin();
+ for(; it != m_impl->dn.end(); ++it)
+ {
+ if(!it->getValue().empty())
+ {
+ ca.getConfig()->setValue("req_distinguished_name_val", it->getOpenSSLType(), it->getValue());
+ }
+ }
+}
+
}
Modified: limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.cpp Fri Aug 13 14:52:46 2010
@@ -30,7 +30,7 @@
#include
#include
#include
-
+#include <fstream>
#include "Utils.hpp"
namespace CA_MGM_NAMESPACE
@@ -153,19 +153,16 @@
}
void
-OpenSSLUtils::createRequest(const DNObject &dn,
- const std::string &outFile,
- const std::string &keyFile,
- const std::string &password,
- const std::string &extension,
- FormatType outForm,
- const std::string &challengePassword,
- const std::string &unstructuredName)
+OpenSSLUtils::createRequest(const std::string &outFile,
+ const std::string &keyFile,
+ const std::string &password,
+ const std::string &extension,
+ FormatType outForm)
{
std::string debugCmd;
debugCmd += m_cmd + " ";
- debugCmd += "req -new ";
+ debugCmd += "req -new -batch ";
path::PathInfo pi(keyFile);
if(!pi.exists() || !pi.isFile())
@@ -208,29 +205,14 @@
env.addVar("pass", password.c_str());
- std::string stdInput;
std::string stdOutput;
std::string errOutput;
int status = -1;
- std::list<RDNObject> dnList = dn.getDN();
- std::list<RDNObject>::const_iterator it;
-
- for(it = dnList.begin(); it != dnList.end(); ++it)
- {
- stdInput += (*it).getValue() + "\n";
- }
-
- stdInput += challengePassword + "\n";
- stdInput += unstructuredName + "\n";
-
- // LOGIT_DEBUG("INPUT: " << stdInput); // disclose secure data
-
try
{
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
- errOutput, env,
- -1, -1, stdInput);
+ errOutput, env);
}
catch(Exception& e)
{
@@ -2575,9 +2557,20 @@
std::string dcmd;
bool foundError = false;
+ std::string input(::tempnam("/tmp/", "md5in"));
+ std::ofstream of(input.c_str());
+ if (!of.good())
+ {
+ ERR << "Can not open file for write" << std::endl;
+ CA_MGM_THROW_ERRNO_MSG(ca_mgm::RuntimeException, __("Can not open file."));
+ }
+ of << in;
+ of.close();
+
dcmd += ca_mgm::OPENSSL_COMMAND + " ";
dcmd += "dgst ";
dcmd += "-md5 ";
+ dcmd += input;
std::vectorstd::string cmd = PerlRegEx("\\s").split(dcmd);
@@ -2590,18 +2583,18 @@
std::string stdOutput;
std::string errOutput;
- int status = -1;
+ int status = -1;
try
{
status = wrapExecuteProcessAndGatherOutput(cmd, stdOutput,
- errOutput, env,
- -1, -1, in);
+ errOutput, env);
}
catch(Exception& e)
{
LOGIT_ERROR( "openssl exception:" << e);
path::removeFile(randfile);
+ path::removeFile(input);
CA_MGM_THROW_SUBEX(ca_mgm::RuntimeException,
__("Executing openssl command failed."), e);
}
@@ -2617,10 +2610,15 @@
}
if(!stdOutput.empty())
{
- stdOutput = str::rtrim(stdOutput);
LOGIT_DEBUG("openssl stdout:" << stdOutput);
+
+ std::vectorstd::string words;
+ str::split( stdOutput, std::back_inserter(words), "=" );
+ stdOutput = str::trim(words.back());
+ LOGIT_DEBUG("openssl md5sum:" << stdOutput);
}
path::removeFile(randfile);
+ path::removeFile(input);
if(foundError)
{
Modified: limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/OpenSSLUtils.hpp Fri Aug 13 14:52:46 2010
@@ -48,14 +48,11 @@
uint32_t bits = 2048,
const std::string &cryptAlgorithm = "des3");
- void createRequest(const DNObject &dn,
- const std::string &outFile,
+ void createRequest(const std::string &outFile,
const std::string &keyFile,
const std::string &password,
const std::string &extension,
- FormatType outForm = E_PEM,
- const std::string &challengePassword = "",
- const std::string &unstructuredName = "");
+ FormatType outForm = E_PEM);
void createSelfSignedCertificate(const std::string &outFile,
const std::string &keyFile,
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.cpp Fri Aug 13 14:52:46 2010
@@ -71,13 +71,13 @@
const std::vectorstd::string &cmd,
std::string &out,
std::string &err,
- const blocxx::EnvVars &env,
- int tmax,
- int omax,
- const std::string &in
+ const blocxx::EnvVars &env
)
{
int exitStatus = -1;
+ int tmax=-1;
+ int omax=-1;
+ std::string in=std::string();
blocxx::Process::Status status;
Modified: limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/Utils.hpp Fri Aug 13 14:52:46 2010
@@ -261,10 +261,7 @@
const std::vectorstd::string &cmd,
std::string &out,
std::string &err,
- const blocxx::EnvVars &env,
- int tmax=-1,
- int omax=-1,
- const std::string &in=std::string()
+ const blocxx::EnvVars &env
);
inline int rehashCAs(const std::string &repositoryDir)
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/CAConfig.hpp Fri Aug 13 14:52:46 2010
@@ -62,6 +62,9 @@
void
deleteValue(const std::string §ion, const std::string &key);
+ void
+ deleteSection(const std::string §ion);
+
/**
* Get the value of Section <b>section</b> with the Key <b>key</b>.
*/
Modified: limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/limal/ca-mgm/DNObject.hpp Fri Aug 13 14:52:46 2010
@@ -29,6 +29,7 @@
namespace CA_MGM_NAMESPACE {
class CAConfig;
+ class CA;
class RDNObjectImpl;
class DNObjectImpl;
@@ -46,6 +47,7 @@
void setRDNValue(const std::string& value);
std::string getType() const;
+ std::string getOpenSSLType() const;
std::string getValue() const;
std::string getOpenSSLValue() const;
@@ -84,13 +86,15 @@
void setDN(const std::list<RDNObject> &dn);
std::list<RDNObject> getDN() const;
- std::string getOpenSSLString() const;
+ std::string getOpenSSLString() const;
virtual bool valid() const;
virtual std::vectorstd::string verify() const;
virtual std::vectorstd::string dump() const;
+ virtual void commit2Config(CA& ca, Type type) const;
+
protected:
ca_mgm::RWCOW_pointer<DNObjectImpl> m_impl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/CertificateTest4.cc Fri Aug 13 14:52:46 2010
@@ -59,6 +59,8 @@
DNObject dn(dnl);
rgd.setSubjectDN(dn);
+ rgd.setChallengePassword("secret");
+ rgd.setUnstructuredName("this is an unstructured name");
// ------------------------ create request --------------------------------
@@ -190,7 +192,7 @@
{
cout << "found KeyID" << endl;
}
- else
+ else
{
cout << (*it) << endl;
}
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/RequestTest.cc Fri Aug 13 14:52:46 2010
@@ -56,6 +56,8 @@
DNObject dn(dnl);
rgd.setSubjectDN(dn);
+ rgd.setChallengePassword("secret");
+ rgd.setUnstructuredName("this is an unstructured name");
// ------------------------ create netscape extension -----------------------------
@@ -94,7 +96,7 @@
RequestData rd = ca.getRequest(r);
- std::vectorstd::string ret = rd.getExtensions().dump();
+ std::vectorstd::string ret = rd.dump();
std::vectorstd::string::const_iterator it;
for(it = ret.begin(); it != ret.end(); ++it)
@@ -103,6 +105,14 @@
{
cout << "found KeyID" << endl;
}
+ else if(str::startsWith((*it), "public Key"))
+ {
+ cout << "found PublicKey" << endl;
+ }
+ else if(str::startsWith((*it), "Signature"))
+ {
+ cout << "found Signature" << endl;
+ }
else
{
cout << (*it) << endl;
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/cam.txt Fri Aug 13 14:52:46 2010
@@ -1,14 +1,14 @@
-d12f85f32848ae7f9f1d8064813aaa53-1281461302 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-68b3a1b7290aadfd42361b1b3c14e69a-1281461303 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281461308 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281461311 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-40717a16174dc4d516f6fa7ee8eeb18c-1281461315 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1281461325 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-c293624b6a877f401407ce8f8f1f327e-1281461326 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
-d12f85f32848ae7f9f1d8064813aaa53-1281461327 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
-c1943ae4b9bd7320fae3e29f217483e3-1281461329 /C=DE/CN=Test Request/emailAddress=suse@suse.de
-d816690a832b0e52becd255d3a62e975-1281461333 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
-9198f6798d9da70d7cbfb67b610633f5-1281461334 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
-3e248858337c2b46dc67a0f9389376dd-1281461336 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
-bf04fdd95062554800c1556085f47063-1281461338 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
-9797ac11af29f94b82c1e5b0499ab5f2-1281461341 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281703849 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+68b3a1b7290aadfd42361b1b3c14e69a-1281703851 /C=DE/CN=Test Server Certificate\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281703857 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281703860 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+40717a16174dc4d516f6fa7ee8eeb18c-1281703864 /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281703874 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c293624b6a877f401407ce8f8f1f327e-1281703875 /C=DE/L=Nuremberg/O=SUSE Linux GmbH/OU=IT/CN=SUSE User CA/emailAddress=security-team@suse.de
+d12f85f32848ae7f9f1d8064813aaa53-1281703876 /C=DE/CN=Test CA\/SUSE Inc.\\\\Gmbh/emailAddress=suse@suse.de
+c1943ae4b9bd7320fae3e29f217483e3-1281703877 /C=DE/CN=Test Request/emailAddress=suse@suse.de
+d816690a832b0e52becd255d3a62e975-1281703881 /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+9198f6798d9da70d7cbfb67b610633f5-1281703883 /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+3e248858337c2b46dc67a0f9389376dd-1281703884 /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+bf04fdd95062554800c1556085f47063-1281703887 /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+9797ac11af29f94b82c1e5b0499ab5f2-1281703891 /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA1/index.txt Fri Aug 13 14:52:46 2010
@@ -1,11 +1,11 @@
-V 110810172823Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
-V 110810172823Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.\Gmbh/emailAddress=suse@suse.de
-V 110810172826Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-V 110810172829Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-V 110810172832Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
-R 110810172849Z 100810172852Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
-R 110810172853Z 100810172854Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
-R 110810172854Z 100810172855Z,keyTime,20100810171215Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
-R 110810172856Z 100810172858Z,CAkeyTime,20100810171217Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
-R 110810172858Z 100810172900Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
-V 120809172901Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
+V 110813125050Z 01 unknown /C=DE/CN=Test CA/SUSE Inc.Gmbh/emailAddress=suse@suse.de
+V 110813125051Z 02 unknown /C=DE/CN=Test Server Certificate/SUSE Inc.Gmbh/emailAddress=suse@suse.de
+V 110813125055Z 03 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110813125058Z 04 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+V 110813125102Z 05 unknown /C=DE/CN=Full Test Certificate/emailAddress=suse@suse.de
+R 110813125118Z 100813125121Z 06 unknown /C=DE/CN=Test Certificate for revocation/emailAddress=suse@suse.de
+R 110813125121Z 100813125123Z,holdInstruction,holdInstructionCallIssuer 07 unknown /C=DE/CN=Test Certificate for revocation 2/emailAddress=suse@suse.de
+R 110813125123Z 100813125124Z,keyTime,20100813123444Z 08 unknown /C=DE/CN=Test Certificate for revocation 3/emailAddress=suse@suse.de
+R 110813125124Z 100813125127Z,CAkeyTime,20100813123447Z 09 unknown /C=DE/CN=Test Certificate for revocation 4/emailAddress=suse@suse.de
+R 110813125127Z 100813125130Z,holdInstruction,1.6.21.43 0A unknown /C=DE/CN=Test Certificate for revocation 5 oid test/emailAddress=suse@suse.de
+V 120812125131Z 0B unknown /C=DE/CN=Test Sub CA/emailAddress=suse@suse.de
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/.rand?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
Binary files - no diff available.
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/TestRepos/Test_CA2/crl/crl.pem Fri Aug 13 14:52:46 2010
@@ -1,7 +1,7 @@
-----BEGIN X509 CRL-----
MIIC+TCCAeECAQEwDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCREUxFzAVBgNV
BAMTDlN0YXRpYyBUZXN0IENBMRswGQYJKoZIhvcNAQkBFgxzdXNlQHN1c2UuZGUX
-DTEwMDgxMDE3MjkwM1oXDTEwMDgxMTE3MjkwM1owgfAwEgIBAxcNMDUwODE4MTQx
+DTEwMDgxMzEyNTEzM1oXDTEwMDgxNDEyNTEzM1owgfAwEgIBAxcNMDUwODE4MTQx
MzIzWjAyAgEEFw0wNTA4MTgxNDEzMjVaMB4wCgYDVR0VBAMKAQYwEAYDVR0XBAkG
ByqGSM44AgIwOgIBBRcNMDUwODE4MTQxMzI2WjAmMAoGA1UdFQQDCgEBMBgGA1Ud
GAQRGA8yMDA1MDgxODE1NTY0NlowOgIBBhcNMDUwODE4MTQxMzI4WjAmMAoGA1Ud
@@ -9,10 +9,10 @@
ODE4WjAaMAoGA1UdFQQDCgEGMAwGA1UdFwQFBgMuFSugdzB1MHMGA1UdIwRsMGqA
FDIAwASkKojCPsrVvdhM01KIIH87oUekRTBDMQswCQYDVQQGEwJERTEXMBUGA1UE
AxMOU3RhdGljIFRlc3QgQ0ExGzAZBgkqhkiG9w0BCQEWDHN1c2VAc3VzZS5kZYIJ
-AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBJyMa0BoGrNjYmCKyc9/dnDykq
-CYkWh4xbTG/XTONg0jKrP1n4aNYXuPR4KNccA7sO6frgT+ZjwGUzPhYCyxw76398
-6iyfFO93K8ehVwMbcoU/LwiPxlzbsMv1sAxylkBvXPbA9zmLWLVya8WWU5OmfEse
-Ihpp5kwMHUqrzWtanvSGSptRU+4z64B+twIeNUtqSoFTL9AzeEQ26nuUiPItVkO9
-21tyKTjB4d5a9LhHjXTwbizb6+qu9Ies/KYvvVQfMqilPxyBH0U5KjA9/QQbmLfP
-oIKbdBuBy8fdGN0KIYxS33WzRd/3ohoUhOmaCdGIanNG2FUI7Vk7d4Z1ghvP
+AI7xzphhj2SdMA0GCSqGSIb3DQEBBQUAA4IBAQBZRDFdegYDlJXia9yz7Gz732/6
+Ht/nm2j2Vw0Hk1In334Lq2c3+qd1TB27S5dIvywCQAGq2FxC0jgcVgzSI6h9FbSI
+ETjhqHpbyrgA6NGfWBH9OcyRRx4E1NhwmlUBTwdbXKF7uAmrkI0sfOr8CEYvXdPy
+g24J3K4yQV8SwP7GNDlnIotEXPHX/krlomH/kFirF1zSxahohGEkqMb9rgiWafxy
+oRVzkP+h7huFkmcKpQef0D+yrxauDn7Pq5r4jWu7E0XnZA2zT+p+eylIZfKtydy3
+QImyRE/pVcUe4Dt2pYwSbeQwUa1XL/brJVOggqypWEl3KDNCXwmH7mL9H0zK
-----END X509 CRL-----
Modified: limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/RequestTest.out
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/RequestTest.out?rev=2696&r1=2695&r2=2696&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/RequestTest.out (original)
+++ limal-branches/mc-devel/limal-ca-mgm/testsuite/single.out/RequestTest.out Fri Aug 13 14:52:46 2010
@@ -8,6 +8,29 @@
DN Key emailAddress
RETURN Request
Request exists: true
+RequestData::dump()
+Version = 1
+DNObject::dump()
+RDNObject::dump()
+countryName=DE
+Prompt:
+Min:0
+Max:0
+RDNObject::dump()
+commonName=Test Request
+Prompt:
+Min:0
+Max:0
+RDNObject::dump()
+emailAddress=suse@suse.de
+Prompt:
+Min:0
+Max:0
+Keysize = 2048
+pubkeyAlgorithm = 0
+found PublicKey
+signatureAlgorithm = 0
+found Signature
X509v3RequestExts::dump()
NsSslServerNameExt::dump()
ExtensionBase::dump()
@@ -52,4 +75,6 @@
email:me@my-company.com
LiteralValue::dump()
URI:http://www.my-company.com/
+Challenge Password = secret
+Unstructured Name = this is an unstructured name
DONE
--
To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org
For additional commands, e-mail: limal-commit+help@opensuse.org
