diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-05-07 11:46:43 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-05-07 17:30:25 +0200 |
| commit | 34ab20cbf79ca50972bf3088c8b6e9978ff0dc2b (patch) | |
| tree | 6af5d48f4e136e80d229ce731fb980b42031b76f | |
| parent | ba006ed40cad2e0d1fe3c3355c18bdfb612c2cd6 (diff) | |
trust: Don't null terminate PKCS #11 string fields
| -rw-r--r-- | trust/module.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/trust/module.c b/trust/module.c index e8b7256..5b73ad7 100644 --- a/trust/module.c +++ b/trust/module.c @@ -444,8 +444,8 @@ sys_C_GetInfo (CK_INFO_PTR info) info->libraryVersion.major = PACKAGE_MAJOR; info->libraryVersion.minor = PACKAGE_MINOR; info->flags = 0; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - strncpy ((char*)info->libraryDescription, LIBRARY_DESCRIPTION, 32); + memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + memcpy ((char*)info->libraryDescription, LIBRARY_DESCRIPTION, 32); } p11_debug ("out: 0x%lx", rv); @@ -527,7 +527,7 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, info->hardwareVersion.major = PACKAGE_MAJOR; info->hardwareVersion.minor = PACKAGE_MINOR; info->flags = CKF_TOKEN_PRESENT; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); /* If too long, copy the first 64 characters into buffer */ path = p11_token_get_path (token); @@ -567,9 +567,9 @@ sys_C_GetTokenInfo (CK_SLOT_ID id, info->hardwareVersion.major = PACKAGE_MAJOR; info->hardwareVersion.minor = PACKAGE_MINOR; info->flags = CKF_TOKEN_INITIALIZED; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - strncpy ((char*)info->model, TOKEN_MODEL, 16); - strncpy ((char*)info->serialNumber, TOKEN_SERIAL_NUMBER, 16); + memcpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + memcpy ((char*)info->model, TOKEN_MODEL, 16); + memcpy ((char*)info->serialNumber, TOKEN_SERIAL_NUMBER, 16); info->ulMaxSessionCount = CK_EFFECTIVELY_INFINITE; info->ulSessionCount = CK_UNAVAILABLE_INFORMATION; info->ulMaxRwSessionCount = 0; |