Skip to content

Commit a016758

Browse files
committed
Add CRL generation capability
1 parent a0c7f6c commit a016758

11 files changed

Lines changed: 2449 additions & 2 deletions

File tree

.github/workflows/android_gradle.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
- name: Clone native wolfSSL
2222
uses: actions/checkout@v4
2323
with:
24-
repository: 'wolfssl/wolfssl'
24+
# Point to PR branch until merge
25+
# TODO: Switch back to wolfssl/wolfssl after merge
26+
repository: 'padelsbach/wolfssl'
27+
ref: crl-generation
2528
path: IDE/Android/app/src/main/cpp/wolfssl
2629

2730
# Copy options.h.in to blank options.h

IDE/Android/app/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ add_library(wolfssljni SHARED
343343
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertManager.c
344344
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertRequest.c
345345
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertificate.c
346+
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCRL.c
346347
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLContext.c
347348
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLSession.c
348349
${wolfssljni_DIR}/native/com_wolfssl_WolfSSLX509Name.c

IDE/WIN/wolfssljni.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCertificate.c" />
4343
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCertManager.c" />
4444
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCertRequest.c" />
45+
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCRL.c" />
4546
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLContext.c" />
4647
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLSession.c" />
4748
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLX509Name.c" />
@@ -56,6 +57,7 @@
5657
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCertificate.h" />
5758
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCertManager.h" />
5859
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCertRequest.h" />
60+
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCRL.h" />
5961
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLContext.h" />
6062
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLSession.h" />
6163
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLX509Name.h" />

IDE/WIN/wolfssljni.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCertRequest.c">
3737
<Filter>Source Files</Filter>
3838
</ClCompile>
39+
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLCRL.c">
40+
<Filter>Source Files</Filter>
41+
</ClCompile>
3942
<ClCompile Include="..\..\native\com_wolfssl_WolfSSLContext.c">
4043
<Filter>Source Files</Filter>
4144
</ClCompile>
@@ -77,6 +80,9 @@
7780
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCertRequest.h">
7881
<Filter>Header Files</Filter>
7982
</ClInclude>
83+
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLCRL.h">
84+
<Filter>Header Files</Filter>
85+
</ClInclude>
8086
<ClInclude Include="..\..\native\com_wolfssl_WolfSSLContext.h">
8187
<Filter>Header Files</Filter>
8288
</ClInclude>

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
<class name="com.wolfssl.WolfSSL"/>
154154
<class name="com.wolfssl.WolfSSLCertManager"/>
155155
<class name="com.wolfssl.WolfSSLCertificate"/>
156+
<class name="com.wolfssl.WolfSSLCRL"/>
156157
<class name="com.wolfssl.WolfSSLContext"/>
157158
<class name="com.wolfssl.WolfSSLSession"/>
158159
<class name="com.wolfssl.WolfSSLX509StoreCtx"/>

java.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,10 @@ gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfCryptEccKey.c -o ./native/co
115115
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLCertManager.c -o ./native/com_wolfssl_WolfSSLCertManager.o $javaIncludes
116116
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLCertRequest.c -o ./native/com_wolfssl_WolfSSLCertRequest.o $javaIncludes
117117
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLCertificate.c -o ./native/com_wolfssl_WolfSSLCertificate.o $javaIncludes
118+
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLCRL.c -o ./native/com_wolfssl_WolfSSLCRL.o $javaIncludes
118119
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLX509Name.c -o ./native/com_wolfssl_WolfSSLX509Name.o $javaIncludes
119120
gcc -Wall -c $fpic $CFLAGS ./native/com_wolfssl_WolfSSLX509StoreCtx.c -o ./native/com_wolfssl_WolfSSLX509StoreCtx.o $javaIncludes
120-
gcc -Wall $javaLibs $CFLAGS -o ./lib/$jniLibName ./native/com_wolfssl_WolfSSL.o ./native/com_wolfssl_WolfSSLSession.o ./native/com_wolfssl_WolfSSLContext.o ./native/com_wolfssl_WolfCryptRSA.o ./native/com_wolfssl_WolfCryptECC.o ./native/com_wolfssl_WolfCryptEccKey.o ./native/com_wolfssl_WolfSSLCertManager.o ./native/com_wolfssl_WolfSSLCertRequest.o ./native/com_wolfssl_WolfSSLCertificate.o ./native/com_wolfssl_WolfSSLX509Name.o ./native/com_wolfssl_WolfSSLX509StoreCtx.o -L$WOLFSSL_INSTALL_DIR/lib -L$WOLFSSL_INSTALL_DIR/lib64 -l$WOLFSSL_LIBNAME
121+
gcc -Wall $javaLibs $CFLAGS -o ./lib/$jniLibName ./native/com_wolfssl_WolfSSL.o ./native/com_wolfssl_WolfSSLSession.o ./native/com_wolfssl_WolfSSLContext.o ./native/com_wolfssl_WolfCryptRSA.o ./native/com_wolfssl_WolfCryptECC.o ./native/com_wolfssl_WolfCryptEccKey.o ./native/com_wolfssl_WolfSSLCertManager.o ./native/com_wolfssl_WolfSSLCertRequest.o ./native/com_wolfssl_WolfSSLCertificate.o ./native/com_wolfssl_WolfSSLCRL.o ./native/com_wolfssl_WolfSSLX509Name.o ./native/com_wolfssl_WolfSSLX509StoreCtx.o -L$WOLFSSL_INSTALL_DIR/lib -L$WOLFSSL_INSTALL_DIR/lib64 -l$WOLFSSL_LIBNAME
121122
if [ $? != 0 ]; then
122123
echo "Error creating native JNI library"
123124
exit 1

0 commit comments

Comments
 (0)