Skip to content

Commit cc44d7d

Browse files
committed
8301274: update for deprecated sprintf for security components
Backport-of: f7dee77d734fdfca29ebf8b8602e1bf04324d44c
1 parent 29fab5d commit cc44d7d

File tree

1 file changed

+5
-5
lines changed
  • src/jdk.crypto.mscapi/windows/native/libsunmscapi

1 file changed

+5
-5
lines changed

src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,17 +1226,17 @@ JNIEXPORT jboolean JNICALL Java_sun_security_mscapi_CSignature_verifyCngSignedHa
12261226

12271227
#define DUMP_PROP(p) \
12281228
if (::NCryptGetProperty(hKey, p, (PBYTE)buffer, 8192, &len, NCRYPT_SILENT_FLAG) == ERROR_SUCCESS) { \
1229-
sprintf(header, "%s %ls", #p, p); \
1229+
snprintf(header, sizeof(header), "%s %ls", #p, p); \
12301230
dump(header, buffer, len); \
12311231
}
12321232

12331233
#define EXPORT_BLOB(p) \
12341234
desc.cBuffers = 0; \
12351235
if (::NCryptExportKey(hKey, NULL, p, &desc, (PBYTE)buffer, 8192, &len, NCRYPT_SILENT_FLAG) == ERROR_SUCCESS) { \
1236-
sprintf(header, "%s %ls (%ld)", #p, p, desc.cBuffers); \
1236+
snprintf(header, sizeof(header), "%s %ls (%ld)", #p, p, desc.cBuffers); \
12371237
dump(header, buffer, len); \
12381238
for (int i = 0; i < (int)desc.cBuffers; i++) { \
1239-
sprintf(header, "desc %ld", desc.pBuffers[i].BufferType); \
1239+
snprintf(header, sizeof(header), "desc %ld", desc.pBuffers[i].BufferType); \
12401240
dump(header, (PBYTE)desc.pBuffers[i].pvBuffer, desc.pBuffers[i].cbBuffer); \
12411241
} \
12421242
}
@@ -1313,7 +1313,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
13131313
bbd.pBuffers = &bb;
13141314
if(::NCryptExportKey(hKey, NULL, NCRYPT_PKCS8_PRIVATE_KEY_BLOB, NULL,
13151315
(PBYTE)buffer, 8192, &len, NCRYPT_SILENT_FLAG) == ERROR_SUCCESS) {
1316-
sprintf(header, "NCRYPT_PKCS8_PRIVATE_KEY_BLOB %ls", NCRYPT_PKCS8_PRIVATE_KEY_BLOB);
1316+
snprintf(header, sizeof(header), "NCRYPT_PKCS8_PRIVATE_KEY_BLOB %ls", NCRYPT_PKCS8_PRIVATE_KEY_BLOB);
13171317
dump(header, buffer, len);
13181318
}
13191319
EXPORT_BLOB(NCRYPT_PROTECTED_KEY_BLOB);
@@ -1448,7 +1448,7 @@ JNIEXPORT jstring JNICALL Java_sun_security_mscapi_CKey_getKeyType
14481448

14491449
} else {
14501450
char buffer[64];
1451-
if (sprintf(buffer, "%lu", dwAlgId)) {
1451+
if (snprintf(buffer, sizeof(buffer), "%lu", dwAlgId)) {
14521452
return env->NewStringUTF(buffer);
14531453
}
14541454
}

0 commit comments

Comments
 (0)