From 0ea69b738f1ff52baf370c3c5d3e2452571793e6 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov 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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'openssl/agent/pkcs11/private-key.cxx') 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 ()) + "' "; } } -- cgit v1.1