Revize e96150c4

Re #8476 - Added `to_dict` method to Subject, minor bugfix

src/model/subject.py

@@ -1 +1 @@
 class Subject:
-    ATTR_MAP = {"C": "common_name", "ST": "state", "L": "locality", "CN": "common_name", "O": "organization",
+    ATTR_MAP = {"C": "country", "ST": "state", "L": "locality", "CN": "common_name", "O": "organization",
                 "OU": "organization_unit", "emailAddress": "email_address"}
+    INVERSE_ATTR_MAP = {k: v for v, k in ATTR_MAP.items()}
 
     def __init__(self, common_name=None, country=None, locality=None, state=None, organization=None,
                  organization_unit=None, email_address=None):
@@ -25 +26 @@
                 s.__setattr__(v, d[k])
 
         return s
+
+    def to_dict(self):
+        return {Subject.INVERSE_ATTR_MAP[k]: v for k, v in vars(self).items()}