mirror of
https://github.com/strongswan/strongswan.git
synced 2025-10-08 00:02:03 -04:00
Make the PKCS#11 padding string trimming public, add null terminator
This commit is contained in:
parent
71151d3c1b
commit
b3b0e57cb1
@ -208,13 +208,14 @@ METHOD(pkcs11_library_t, destroy, void,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trim a string
|
* See header
|
||||||
*/
|
*/
|
||||||
static void trim(char *str, int len)
|
void pkcs11_library_trim(char *str, int len)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = len - 1; i > 0; i--)
|
str[len - 1] = '\0';
|
||||||
|
for (i = len - 2; i > 0; i--)
|
||||||
{
|
{
|
||||||
if (str[i] == ' ')
|
if (str[i] == ' ')
|
||||||
{
|
{
|
||||||
@ -318,16 +319,15 @@ static bool initialize(private_pkcs11_library_t *this, char *name, char *file)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
trim(info.manufacturerID,
|
pkcs11_library_trim(info.manufacturerID,
|
||||||
strnlen(info.manufacturerID, sizeof(info.manufacturerID)));
|
strnlen(info.manufacturerID, sizeof(info.manufacturerID)));
|
||||||
trim(info.libraryDescription,
|
pkcs11_library_trim(info.libraryDescription,
|
||||||
strnlen(info.libraryDescription, sizeof(info.libraryDescription)));
|
strnlen(info.libraryDescription, sizeof(info.libraryDescription)));
|
||||||
|
|
||||||
DBG1(DBG_CFG, "loaded PKCS#11 v%d.%d library '%s' (%s)",
|
DBG1(DBG_CFG, "loaded PKCS#11 v%d.%d library '%s' (%s)",
|
||||||
info.cryptokiVersion.major, info.cryptokiVersion.minor, name, file);
|
info.cryptokiVersion.major, info.cryptokiVersion.minor, name, file);
|
||||||
DBG1(DBG_CFG, " %.*s: %.*s v%d.%d",
|
DBG1(DBG_CFG, " %s: %s v%d.%d",
|
||||||
sizeof(info.manufacturerID), info.manufacturerID,
|
info.manufacturerID, info.libraryDescription,
|
||||||
sizeof(info.libraryDescription), info.libraryDescription,
|
|
||||||
info.libraryVersion.major, info.libraryVersion.minor);
|
info.libraryVersion.major, info.libraryVersion.minor);
|
||||||
if (args.flags & CKF_OS_LOCKING_OK)
|
if (args.flags & CKF_OS_LOCKING_OK)
|
||||||
{
|
{
|
||||||
|
@ -55,6 +55,14 @@ struct pkcs11_library_t {
|
|||||||
*/
|
*/
|
||||||
extern enum_name_t *ck_rv_names;
|
extern enum_name_t *ck_rv_names;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trim/null terminate a string returned by the varius PKCS#11 functions.
|
||||||
|
*
|
||||||
|
* @param str string to trim
|
||||||
|
* @param len max length of the string
|
||||||
|
*/
|
||||||
|
void pkcs11_library_trim(char *str, int len);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a pkcs11_library instance.
|
* Create a pkcs11_library instance.
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user