From 0ea69b738f1ff52baf370c3c5d3e2452571793e6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 13 Jul 2022 12:41:13 +0200
Subject: Work around bogus -Wrestrict GCC 12 warning (bug #105329)

---
 openssl/agent/pkcs11/private-key.cxx | 10 +++++-----
 openssl/agent/pkcs11/url.cxx         | 10 +++++-----
 openssl/types.cxx                    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/openssl/agent/pkcs11/private-key.cxx b/openssl/agent/pkcs11/private-key.cxx
index ddaf0eb..0f95f72 100644
--- a/openssl/agent/pkcs11/private-key.cxx
+++ b/openssl/agent/pkcs11/private-key.cxx
@@ -212,7 +212,7 @@ namespace openssl
           {
             string d (API_STRING (si.slotDescription));
             return "slot " + to_string (sid) + " (" +
-                   (!d.empty () ? d : API_STRING (si.manufacturerID)) + ")";
+                   (!d.empty () ? d : API_STRING (si.manufacturerID)) + ')';
           };
 
           // Match the token information.
@@ -244,9 +244,9 @@ namespace openssl
             string l (API_STRING (ti.label));
 
             r += !l.empty ()
-            ? "'" + l + "'"
-            : "'" + API_STRING (ti.model) + "' by " +
-              API_STRING (ti.manufacturerID);
+            ? ('\'' + l + '\'')
+            : ('\'' + API_STRING (ti.model) + "' by " +
+               API_STRING (ti.manufacturerID));
 
             return r;
           };
@@ -381,7 +381,7 @@ namespace openssl
                                            &attr,
                                            1 /* ulCount */);
               if (r == CKR_OK)
-                description += "'" + string (label.data (), label.size ()) +
+                description += '\'' + string (label.data (), label.size ()) +
                                "' ";
             }
           }
diff --git a/openssl/agent/pkcs11/url.cxx b/openssl/agent/pkcs11/url.cxx
index 0c946d9..8823480 100644
--- a/openssl/agent/pkcs11/url.cxx
+++ b/openssl/agent/pkcs11/url.cxx
@@ -34,7 +34,7 @@ namespace openssl
             return v;
         }
 
-        throw invalid_argument (string ("invalid ") + what + " '" + s + "'");
+        throw invalid_argument (string ("invalid ") + what + " '" + s + '\'');
       }
 
       // url_traits
@@ -134,7 +134,7 @@ namespace openssl
 
         if (i == e)
           throw invalid_argument (
-            "no value for attribute '" + string (s, b, n) + "'");
+            "no value for attribute '" + string (s, b, n) + '\'');
 
         string a;
         url::decode (s.begin () + b, s.begin () + i, back_inserter (a));
@@ -168,7 +168,7 @@ namespace openssl
           auto set = [&an] (auto& attr, auto&& val)
           {
             if (attr)
-              throw invalid_argument ("duplicate attribute '" + an + "'");
+              throw invalid_argument ("duplicate attribute '" + an + '\'');
 
             attr = move (val);
           };
@@ -213,7 +213,7 @@ namespace openssl
           else if (an == "type")
             set (type, move (av));
           else
-            throw invalid_argument ("unknown attribute '" + an + "'");
+            throw invalid_argument ("unknown attribute '" + an + '\'');
         }
       }
 
@@ -240,7 +240,7 @@ namespace openssl
           auto set = [&an] (auto& attr, auto&& val)
           {
             if (attr)
-              throw invalid_argument ("duplicate attribute '" + an + "'");
+              throw invalid_argument ("duplicate attribute '" + an + '\'');
 
             attr = move (val);
           };
diff --git a/openssl/types.cxx b/openssl/types.cxx
index ce59036..e70e162 100644
--- a/openssl/types.cxx
+++ b/openssl/types.cxx
@@ -23,6 +23,6 @@ namespace openssl
   {
          if (s == "success") return simulate_outcome::success;
     else if (s == "failure") return simulate_outcome::failure;
-    else throw invalid_argument ("invalid simulate outcome '" + s + "'");
+    else throw invalid_argument ("invalid simulate outcome '" + s + '\'');
   }
 }
-- 
cgit v1.1