aboutsummaryrefslogtreecommitdiff
path: root/openssl/agent/pkcs11/private-key.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-07-13 12:41:13 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-07-13 12:41:13 +0200
commit0ea69b738f1ff52baf370c3c5d3e2452571793e6 (patch)
treef7114bbbaa75069c3a9bc2a079e1f1fd59c6e359 /openssl/agent/pkcs11/private-key.cxx
parent7a760e31440ad49039e6b416a30465efc6047407 (diff)
Work around bogus -Wrestrict GCC 12 warning (bug #105329)
Diffstat (limited to 'openssl/agent/pkcs11/private-key.cxx')
-rw-r--r--openssl/agent/pkcs11/private-key.cxx10
1 files changed, 5 insertions, 5 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 ()) +
"' ";
}
}