Merge pull request #3 from cedadev/master

sync'ing with base
philipkershaw · Feb 23, 2016 · 612dc22 · 612dc22
2 parents 90770bd + 7681190
commit 612dc22
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/contrail/security/ca/callout_impl.py b/contrail/security/ca/callout_impl.py
@@ -36,7 +36,7 @@ def issue_certificate(self, cert_req):
         @param cert_req: Certificate request to use
         @return: output certificate
         ''' 
-        try:       
+        try:
             out_cert_file = tempfile.NamedTemporaryFile(delete=False)
             in_csr_file = tempfile.NamedTemporaryFile(delete=False)
             s_cert_req = crypto.dump_certificate_request(crypto.FILETYPE_PEM, 
@@ -45,7 +45,6 @@ def issue_certificate(self, cert_req):
             in_csr_file.write(s_cert_req)
             in_csr_file.close()
 
-
             cmd_tmpl = string.Template(self.cert_issue_cmd)
             populated_cmd = cmd_tmpl.substitute(in_csr=in_csr_file.name,
                                                 out_cert=out_cert_file.name)

diff --git a/contrail/security/ca/test/ca_config/index.txt b/contrail/security/ca/test/ca_config/index.txt
@@ -1,2 +1,4 @@
 V	131029132955Z		01	unknown	/O=NDG/OU=Security/CN=11972403-95b6-410b-8c9a-b6444d9adb17
 V	131029133048Z		02	unknown	/O=NDG/OU=Security/CN=060add14-f373-414a-ae34-2fde1003a1d3
+V	161202153416Z		03	unknown	/O=NDG/OU=Security/CN=a2d365af-22b9-4013-a3ba-2a5560ac54e3
+V	161202165626Z		04	unknown	/O=NDG/OU=Security/CN=74ac7608-1c84-4347-ae28-9ac091e495c3
diff --git a/contrail/security/ca/test/ca_config/serial b/contrail/security/ca/test/ca_config/serial
@@ -1 +1 @@
-03
+05
diff --git a/contrail/security/ca/test/ca_config/test-ca.cfg b/contrail/security/ca/test/ca_config/test-ca.cfg
@@ -82,8 +82,8 @@ policy		= policy_match
 [ policy_match ]
 countryName		= optional
 stateOrProvinceName	= optional
-organizationName	= match
-organizationalUnitName	= match
+organizationName	= supplied
+organizationalUnitName	= supplied
 commonName		= supplied
 emailAddress		= optional
 
@@ -135,7 +135,7 @@ stateOrProvinceName_default	= Some-State
 localityName			= Locality Name (eg, city)
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= NDG
+0.organizationName_default	= 
 
 # we can do this but it is not needed normally :-)
 #1.organizationName		= Second Organization Name (eg, company)

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 setup(
     name =            	'ContrailCA',
-    version =         	'0.1.0',
+    version =         	'0.2.0',
     description =     	'Certificate Authority',
     long_description = 	'''\
 Provides a simple implementation of a Certificate Authority.  It uses the 
@@ -47,9 +47,9 @@
     author_email =    	'[email protected]',
     maintainer =        'Philip Kershaw',
     maintainer_email =  '[email protected]',
-    url =             	'https://github.com/philipkershaw/CertificateAuthority',
+    url =             	'https://github.com/cedadev/CertificateAuthority',
     platforms =         ['POSIX', 'Linux', 'Windows'],
-    install_requires =  ['ndg_httpsclient'],
+    install_requires =  ['pyOpenSSL'],
 
     # Required for Subject Alt Names unit test only
     extras_require = {'subjectAltName_support': 'pyasn1'},