From c39b8f8c8fd3af8e4587cd1c454a87c7fefb6490 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Thu, 4 Dec 2014 08:15:46 +0000
Subject: [PATCH] Check subject name encoding in ipa-cacert-manage renew

https://fedorahosted.org/freeipa/ticket/4781

Reviewed-By: David Kupka <dkupka@redhat.com>
---
 ipaserver/install/ipa_cacert_manage.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py
index 2a8d95fdbebecf543a05afd47275c32684cad970..8fda6a263454e8a4046baa1da069cdcddeb177a9 100644
--- a/ipaserver/install/ipa_cacert_manage.py
+++ b/ipaserver/install/ipa_cacert_manage.py
@@ -213,18 +213,21 @@ class CACertManage(admintool.AdminTool):
         try:
             nss_cert = x509.load_certificate(old_cert, x509.DER)
             subject = nss_cert.subject
+            der_subject = x509.get_der_subject(old_cert, x509.DER)
             #pylint: disable=E1101
             pkinfo = nss_cert.subject_public_key_info.format()
             #pylint: enable=E1101
 
             nss_cert = x509.load_certificate_from_file(cert_file.name)
+            cert = nss_cert.der_data
             if nss_cert.subject != subject:
                 raise admintool.ScriptError("Subject name mismatch")
+            if x509.get_der_subject(cert, x509.DER) != der_subject:
+                raise admintool.ScriptError("Subject name encoding mismatch")
             #pylint: disable=E1101
             if nss_cert.subject_public_key_info.format() != pkinfo:
                 raise admintool.ScriptError("Subject public key info mismatch")
             #pylint: enable=E1101
-            cert = nss_cert.der_data
         finally:
             del nss_cert
             nss.nss_shutdown()
@@ -238,7 +241,7 @@ class CACertManage(admintool.AdminTool):
                 tmpdb.add_cert(cert, 'IPA CA', 'C,,')
             except ipautil.CalledProcessError, e:
                 raise admintool.ScriptError(
-                    "Not compatible with the current CA certificate: %s", e)
+                    "Not compatible with the current CA certificate: %s" % e)
 
             ca_certs = x509.load_certificate_list_from_file(ca_file.name)
             for ca_cert in ca_certs:
-- 
2.1.0