WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #47 from cconlon/des3fips 

Des3_fips() API not available in wolfCrypt FIPSv5
pull/48/head
JacobBarthelmeh 2023-05-04 07:52:10 -07:00 committed by GitHub
parent 63b9f6bdb3 e1eb1d3cfd
commit 9c6ada806b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jni/jni_fips.c
View File

@ -865,7 +865,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1SetKey_1fips__Lcom_
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* key = NULL;
@ -903,7 +905,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1SetKey_1fips__Lcom_
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* key = NULL;
@ -941,7 +945,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1SetIV_1fips__Lcom_w
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* iv = NULL;
@ -972,7 +978,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1SetIV_1fips__Lcom_w
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* iv = NULL;
@ -1005,7 +1013,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1CbcEncrypt_1fips__L
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* out = NULL;
@ -1042,7 +1052,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1CbcEncrypt_1fips__L
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* out = NULL;
@ -1081,7 +1093,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1CbcDecrypt_1fips__L
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* out = NULL;
@ -1118,7 +1132,9 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_wolfcrypt_Fips_Des3_1CbcDecrypt_1fips__L
{
jint ret = NOT_COMPILED_IN;
#if defined(HAVE_FIPS) && !defined(NO_DES3)
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2)) && \
!defined(NO_DES3)
Des3* des = NULL;
byte* out = NULL;

6
src/test/java/com/wolfssl/wolfcrypt/test/fips/Des3FipsTest.java
View File

@ -52,6 +52,12 @@ public class Des3FipsTest extends FipsTest {
* but not when method is overridden here */
Assume.assumeTrue(Fips.enabled);
/* 3DES not included in FIPS boundary for 140-3 */
if (Fips.fipsVersion < 5) {
System.out.println("Des3 test skipped for 140-3");
}
Assume.assumeTrue(Fips.fipsVersion < 5);
try {
new Des3();
} catch (WolfCryptException e) {