X-Git-Url: https://v.licheni.net/stack/cam.git/blobdiff_plain/7e4567f1470bf3a2c134438672247b3041a011c3..d439174a02ec4273560f621f1e003d23c8e05b9d:/cam/ca.py

diff --git a/cam/ca.py b/cam/ca.py
index f870389..f906819 100644
--- a/cam/ca.py
+++ b/cam/ca.py
@@ -28,7 +28,7 @@ class CA(object):
         self.basedir = basedir
         self.config = {'basedir': basedir, 'default_days': '365', 'ou': 'CA',
                        'days': '3650', 'country': 'XX', 'crl_url': '',
-                       'signature_algorithm': 'sha1', 'bits': '2048'}
+                       'signature_algorithm': 'sha256', 'bits': '2048'}
         self.config.update(config)
         self.files = _CAFiles(basedir, 
                               conf='conf/ca.conf',
@@ -156,6 +156,15 @@ class CA(object):
             '-key', self._getpw())
         self.gencrl()
 
+    def verify(self, path):
+        log.info('verifying certificate %s', path)
+        args = ['verify', '-CAfile', self.files.public_key, path]
+        try:
+            openssl_wrap.run(*args, CAROOT=os.path.abspath(self.basedir))
+        except openssl_wrap.CommandError:
+            return False
+        return True
+
     def generate(self, cert):
         self._update_config()
 
@@ -187,6 +196,7 @@ class CA(object):
             openssl_wrap.run_with_config(
                 self.basedir, conf_file,
                 'req', '-new', '-keyout', cert.private_key_file,
+                '-' + self.config['signature_algorithm'],
                 '-nodes', '-out', csr_file)
             os.chmod(cert.private_key_file, 0600)
             openssl_wrap.run_with_config(