Skip to content

Commit cdd178f

Browse files
Whitespace only clang format changes (#979)
This update applies the .clang-format rules to the current C code base. These updates should be whitespace only in nature. Signed-off-by: Jason Katonica <[email protected]>
1 parent 09c7937 commit cdd178f

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/main/native/AESKeyWrap.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_CIPHER_1KeyWraporUnwrap(
4545
env, input, &isCopy));
4646

4747
if (NULL == inputNative) {
48-
throwOCKException(env, 0, "Input is NULL from GetPrimitiveArrayCritical!");
48+
throwOCKException(env, 0,
49+
"Input is NULL from GetPrimitiveArrayCritical!");
4950
return retOutBytes;
5051
}
5152

@@ -55,7 +56,8 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_CIPHER_1KeyWraporUnwrap(
5556
if (NULL == KEKNative) {
5657
(*env)->ReleasePrimitiveArrayCritical(env, input, inputNative,
5758
JNI_ABORT);
58-
throwOCKException(env, 0, "KEK is NULL from GetPrimitiveArrayCritical!");
59+
throwOCKException(env, 0,
60+
"KEK is NULL from GetPrimitiveArrayCritical!");
5961
return retOutBytes;
6062
}
6163

@@ -82,8 +84,9 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_CIPHER_1KeyWraporUnwrap(
8284
(unsigned char *)((*env)->GetPrimitiveArrayCritical(
8385
env, outBytes, &isCopy));
8486
if (outBytesNative == NULL) {
85-
throwOCKException(env, 0,
86-
"Output is NULL from GetPrimitiveArrayCritical");
87+
throwOCKException(
88+
env, 0,
89+
"Output is NULL from GetPrimitiveArrayCritical");
8790
} else {
8891
memcpy(outBytesNative, outputLocal, outputlen);
8992
retOutBytes = outBytes;

src/main/native/CCM.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ void handleIV_CCM(int ivLength, int keyLen, int blockSize, int J0Offset,
145145
}
146146

147147
// Appending IV.length
148-
putLongtoByteArray_CCM(ivLengthOG * 8, (char*)&lastIV,
149-
lastIVLen - 8);
148+
putLongtoByteArray_CCM(ivLengthOG * 8, (char*)&lastIV, lastIVLen - 8);
150149
z_kimd_native_CCM((signed char*)&lastIV, lastIVLen, 0,
151150
(signed char*)&ghashParamBlock, 65);
152151

src/main/native/GCM.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -963,8 +963,7 @@ void handleIV(int ivLength, int keyLen, int blockSize, int J0Offset, char* iv,
963963
}
964964

965965
// Appending IV.length
966-
putLongtoByteArray(ivLengthOG * 8, (char*)&lastIV,
967-
lastIVLen - 8);
966+
putLongtoByteArray(ivLengthOG * 8, (char*)&lastIV, lastIVLen - 8);
968967
z_kimd_native((signed char*)&lastIV, lastIVLen, 0,
969968
(signed char*)&ghashParamBlock, 65);
970969

@@ -1693,8 +1692,8 @@ Java_com_ibm_crypto_plus_provider_ock_NativeInterface_create_1GCM_1context(
16931692
gslogMessage("ICC_AES_GCM_CTX_new failed to create a new context.");
16941693
}
16951694
#endif
1696-
throwOCKException(env, 0,
1697-
"ICC_AES_GCM_CTX_new failed to create a new context.");
1695+
throwOCKException(
1696+
env, 0, "ICC_AES_GCM_CTX_new failed to create a new context.");
16981697
}
16991698
if (debug) {
17001699
gslogFunctionExit(functionName);

src/main/native/Utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void com_ibm_crypto_plus_provider_initialize(void) {
2828
#if DEBUG
2929
/*if( getenv("JICC.debug") != NULL ) {*/
3030
debug = 1; // FIXME;
31-
/*}*/
31+
/*}*/
3232
#endif
3333
initialized = 1;
3434
}

0 commit comments

Comments
 (0)