diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-04-08 01:19:11 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-04-08 01:19:11 +0000 |
| commit | de10f2e64cb7faf0ba0222a22035b81ca07e7426 (patch) | |
| tree | 4730e5702aed17855a41dcf5a2e14f09247ecf93 /src/lib/Server/Admin/Fingerprint.py | |
| parent | 61d5b7caec10262206968e2dcbaf242806b5021e (diff) | |
| download | bcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.tar.gz bcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.tar.bz2 bcfg2-de10f2e64cb7faf0ba0222a22035b81ca07e7426.zip | |
Implement ssl certificate split, in preparation for SSL client cert auth
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5155 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Admin/Fingerprint.py')
| -rw-r--r-- | src/lib/Server/Admin/Fingerprint.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Server/Admin/Fingerprint.py b/src/lib/Server/Admin/Fingerprint.py index 39a180d51..07c67bc72 100644 --- a/src/lib/Server/Admin/Fingerprint.py +++ b/src/lib/Server/Admin/Fingerprint.py @@ -18,7 +18,10 @@ class Fingerprint(Bcfg2.Server.Admin.Mode): def getFingerprint(self): '''calculate key fingerprint''' - keypath = self.cfp.get('communication', 'key') + try: + keypath = self.cfp.get('communication', 'certificate') + except: + keypath = self.cfp.get('communication', 'key') x509 = Bcfg2.tlslite.api.X509() x509.parse(open(keypath).read()) return x509.getFingerprint() |