Moved label strings to Label namespace

Author: Lauris Kaplinski

cdoc/CDoc.h

@@ -184,7 +184,7 @@ struct FileInfo {
 };
 
 namespace CDoc2 {
-
+namespace Label {
     /**
      * @brief Recipient types for machine-readable labels
      * 
@@ -202,16 +202,17 @@ namespace CDoc2 {
      * @brief Recipient data for machine-readable labels
      * 
      */
-    static constexpr std::string_view LBL_VERSION = "v";
-    static constexpr std::string_view LBL_TYPE = "type";
-    static constexpr std::string_view LBL_FILE = "file";
-    static constexpr std::string_view LBL_LABEL = "label";
-    static constexpr std::string_view LBL_CN = "cn";
-    static constexpr std::string_view LBL_SERIAL_NUMBER = "serial_number";
-    static constexpr std::string_view LBL_LAST_NAME = "last_name";
-    static constexpr std::string_view LBL_FIRST_NAME = "first_name";
-    static constexpr std::string_view LBL_CERT_SHA1 = "cert_sha1";
-};
+    static constexpr std::string_view VERSION = "v";
+    static constexpr std::string_view TYPE = "type";
+    static constexpr std::string_view FILE = "file";
+    static constexpr std::string_view LABEL = "label";
+    static constexpr std::string_view CN = "cn";
+    static constexpr std::string_view SERIAL_NUMBER = "serial_number";
+    static constexpr std::string_view LAST_NAME = "last_name";
+    static constexpr std::string_view FIRST_NAME = "first_name";
+    static constexpr std::string_view CERT_SHA1 = "cert_sha1";
+}
+}
 
 }; // namespace libcdoc
 

cdoc/CDoc2.h

@@ -59,10 +59,10 @@ constexpr std::string_view LABELBASE64IND{";base64,"};
  * @brief EID type values for machine-readable label
  */
 static constexpr std::string_view eid_strs[] = {
-    CDoc2::TYPE_UNKNOWN,
-    CDoc2::TYPE_ID_CARD,
-    CDoc2::TYPE_DIGI_ID,
-    CDoc2::TYPE_DIGI_ID_E_RESIDENT
+    CDoc2::Label::TYPE_UNKNOWN,
+    CDoc2::Label::TYPE_ID_CARD,
+    CDoc2::Label::TYPE_DIGI_ID,
+    CDoc2::Label::TYPE_DIGI_ID_E_RESIDENT
 };
 
 } // namespace CDoc2

cdoc/Recipient.cpp

@@ -133,8 +133,8 @@ buildLabel(std::ostream& ofs, std::string_view type, const std::map<std::string_
             parts[key] = value;
     }
     ofs << CDoc2::LABELPREFIX;
-    ofs << CDoc2::LBL_VERSION << '=' << std::to_string(CDoc2::KEYLABELVERSION) << '&'
-        << CDoc2::LBL_TYPE << '=' << type;
+    ofs << CDoc2::Label::VERSION << '=' << std::to_string(CDoc2::KEYLABELVERSION) << '&'
+        << CDoc2::Label::TYPE << '=' << type;
     for (const auto& [key, value] : parts) {
         if (!value.empty())
             ofs << '&' << urlEncode(key) << '=' << urlEncode(value);
@@ -146,19 +146,19 @@ BuildLabelEID(std::ostream& ofs, Certificate::EIDType type, const Certificate& x
 {
 
     buildLabel(ofs, CDoc2::eid_strs[type], lbl_parts, {
-        {CDoc2::LBL_CN, x509.getCommonName()},
-        {CDoc2::LBL_SERIAL_NUMBER, x509.getSerialNumber()},
-        {CDoc2::LBL_LAST_NAME, x509.getSurname()},
-        {CDoc2::LBL_FIRST_NAME, x509.getGivenName()},
+        {CDoc2::Label::CN, x509.getCommonName()},
+        {CDoc2::Label::SERIAL_NUMBER, x509.getSerialNumber()},
+        {CDoc2::Label::LAST_NAME, x509.getSurname()},
+        {CDoc2::Label::FIRST_NAME, x509.getGivenName()},
     });
 }
 
 static void
 BuildLabelCertificate(std::ostream &ofs, const Certificate& x509, const std::map<std::string_view,std::string_view>& lbl_parts)
 {
-    buildLabel(ofs, CDoc2::TYPE_CERTIFICATE, lbl_parts, {
-        {CDoc2::LBL_CN, x509.getCommonName()},
-        {CDoc2::LBL_CERT_SHA1, toHex(x509.getDigest())}
+    buildLabel(ofs, CDoc2::Label::TYPE_CERTIFICATE, lbl_parts, {
+        {CDoc2::Label::CN, x509.getCommonName()},
+        {CDoc2::Label::CERT_SHA1, toHex(x509.getDigest())}
     });
 }
 
@@ -183,9 +183,9 @@ Recipient::getLabel(const std::vector<std::pair<std::string_view, std::string_vi
             break;
         case SYMMETRIC_KEY:
             if (kdf_iter > 0) {
-                buildLabel(ofs, CDoc2::TYPE_PASSWORD, parts, {});
+                buildLabel(ofs, CDoc2::Label::TYPE_PASSWORD, parts, {});
             } else {
-                buildLabel(ofs, CDoc2::TYPE_SYMMETRIC, parts, {});
+                buildLabel(ofs, CDoc2::Label::TYPE_SYMMETRIC, parts, {});
             }
             break;
         case PUBLIC_KEY:
@@ -197,7 +197,7 @@ Recipient::getLabel(const std::vector<std::pair<std::string_view, std::string_vi
                     BuildLabelCertificate(ofs, x509, parts);
                 }
             } else {
-                buildLabel(ofs, CDoc2::TYPE_PUBLIC_KEY, parts, {});
+                buildLabel(ofs, CDoc2::Label::TYPE_PUBLIC_KEY, parts, {});
             }
             break;
         case KEYSHARE: