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

Adds <wolfssl/options.h> to Android platform. 

Reorders includes to avoid side effects in wolfssl's headers.
pull/2/merge
Moisés Guimarães 2016-03-21 14:42:25 -03:00
parent a0b9f1da93
commit d40171317f
14 changed files with 36 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jni/jni_aes.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/aes.h>
#include <com_wolfssl_wolfcrypt_Aes.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/aes.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

9
jni/jni_asn.c
View File

@ -19,17 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/asn_public.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <com_wolfssl_wolfcrypt_Asn.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/asn_public.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_des3.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/des3.h>
#include <com_wolfssl_wolfcrypt_Des3.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/des3.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_dh.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/dh.h>
#include <com_wolfssl_wolfcrypt_Dh.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/dh.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_ecc.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/ecc.h>
#include <com_wolfssl_wolfcrypt_Ecc.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/ecc.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_error.c
View File

@ -19,14 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <com_wolfssl_wolfcrypt_WolfCryptError.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
JNIEXPORT jstring JNICALL Java_com_wolfssl_wolfcrypt_WolfCryptError_wc_1GetErrorString
(JNIEnv* env, jclass obj, jint error)
{

15
jni/jni_fips.c
View File

@ -19,17 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <stdio.h>
#include <com_wolfssl_wolfcrypt_WolfCrypt.h>
#include <com_wolfssl_wolfcrypt_Fips.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/fips_test.h>
#include <wolfssl/wolfcrypt/aes.h>
@ -43,6 +35,11 @@
#include <cyassl/ctaocrypt/dh.h>
#include <cyassl/ctaocrypt/ecc.h>
#include <com_wolfssl_wolfcrypt_WolfCrypt.h>
#include <com_wolfssl_wolfcrypt_Fips.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_hmac.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/hmac.h>
#include <com_wolfssl_wolfcrypt_Hmac.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/hmac.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_logging.c
View File

@ -19,14 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/logging.h>
#include <com_wolfssl_wolfcrypt_Logging.h>
#include <wolfssl/wolfcrypt/logging.h>
int wolfSSL_Debugging_ON(void);
void wolfSSL_Debugging_OFF(void);

7
jni/jni_md5.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/md5.h>
#include <com_wolfssl_wolfcrypt_Md5.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/md5.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

7
jni/jni_native_struct.c
View File

@ -19,15 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/types.h>
#include <com_wolfssl_wolfcrypt_NativeStruct.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfssl/wolfcrypt/types.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

6
jni/jni_rng.c
View File

@ -19,14 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/random.h>
#include <com_wolfssl_wolfcrypt_Rng.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/random.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

9
jni/jni_rsa.c
View File

@ -19,17 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/rsa.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <com_wolfssl_wolfcrypt_Rsa.h>
#include <wolfcrypt_jni_NativeStruct.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/wolfcrypt/rsa.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>

11
jni/jni_sha.c
View File

@ -19,17 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ANDROID__
#include <wolfssl/options.h>
#endif
#include <com_wolfssl_wolfcrypt_Sha.h>
#include <wolfcrypt_jni_error.h>
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/sha.h>
#include <wolfssl/wolfcrypt/sha256.h>
#include <wolfssl/wolfcrypt/sha512.h>
#include <com_wolfssl_wolfcrypt_Sha.h>
#include <wolfcrypt_jni_error.h>
/* #define WOLFCRYPT_JNI_DEBUG_ON */
#include <wolfcrypt_jni_debug.h>