Repository: commons-crypto Updated Branches: refs/heads/master c24b691ac -> 158be0644
Tab police Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/158be064 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/158be064 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/158be064 Branch: refs/heads/master Commit: 158be0644c353a617427ab190a4f09082cda42ac Parents: c24b691 Author: Sebb <s...@apache.org> Authored: Wed Feb 15 22:11:02 2017 +0000 Committer: Sebb <s...@apache.org> Committed: Wed Feb 15 22:11:02 2017 +0000 ---------------------------------------------------------------------- .../apache/commons/crypto/OpenSslInfoNative.c | 28 ++++++++++---------- .../commons/crypto/cipher/OpenSslNative.c | 2 +- .../commons/crypto/org_apache_commons_crypto.h | 26 +++++++++--------- .../crypto/random/OpenSslCryptoRandomNative.c | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/158be064/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c ---------------------------------------------------------------------- diff --git a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c index 85d1407..bb71638 100644 --- a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c +++ b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c @@ -73,7 +73,7 @@ static void get_methods(JNIEnv *env, HMODULE openssl) } static int load_library(JNIEnv *env) { - char msg[100]; + char msg[100]; #ifdef UNIX openssl = dlopen(COMMONS_CRYPTO_OPENSSL_LIBRARY, RTLD_LAZY | RTLD_GLOBAL); #endif @@ -89,7 +89,7 @@ static int load_library(JNIEnv *env) #endif #ifdef WINDOWS snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY, \ - GetLastError()); + GetLastError()); #endif THROW(env, "java/lang/UnsatisfiedLinkError", msg); return 0; @@ -101,37 +101,37 @@ static int load_library(JNIEnv *env) JNIEXPORT jstring JNICALL Java_org_apache_commons_crypto_OpenSslInfoNative_SSLeayVersion (JNIEnv *env, jclass clazz, jint type) { - if (!load_library(env)) { - return NULL; - } + if (!load_library(env)) { + return NULL; + } - jstring answer = (*env)->NewStringUTF(env,dlsym_SSLeay_version(type)); - return answer; + jstring answer = (*env)->NewStringUTF(env,dlsym_SSLeay_version(type)); + return answer; } JNIEXPORT jlong JNICALL Java_org_apache_commons_crypto_OpenSslInfoNative_SSLeay (JNIEnv *env, jobject object) { - if (!load_library(env)) { - return 0; - } - return dlsym_SSLeay(); + if (!load_library(env)) { + return 0; + } + return dlsym_SSLeay(); } JNIEXPORT jstring JNICALL Java_org_apache_commons_crypto_OpenSslInfoNative_NativeVersion (JNIEnv *env, jobject object) { - return (*env)->NewStringUTF(env, VERSION); + return (*env)->NewStringUTF(env, VERSION); } JNIEXPORT jstring JNICALL Java_org_apache_commons_crypto_OpenSslInfoNative_NativeTimeStamp (JNIEnv *env, jobject object) { - return (*env)->NewStringUTF(env, __DATE__); + return (*env)->NewStringUTF(env, __DATE__); } JNIEXPORT jstring JNICALL Java_org_apache_commons_crypto_OpenSslInfoNative_NativeName (JNIEnv *env, jobject object) { - return (*env)->NewStringUTF(env, PROJECT_NAME); + return (*env)->NewStringUTF(env, PROJECT_NAME); } http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/158be064/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c ---------------------------------------------------------------------- diff --git a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c index 5e39e13..46196e5 100644 --- a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c +++ b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c @@ -135,7 +135,7 @@ JNIEXPORT void JNICALL Java_org_apache_commons_crypto_cipher_OpenSslNative_initI #endif #ifdef WINDOWS snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY, \ - GetLastError()); + GetLastError()); #endif THROW(env, "java/lang/UnsatisfiedLinkError", msg); return; http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/158be064/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h ---------------------------------------------------------------------- diff --git a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h index 1edc4ee..936cfb3 100644 --- a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h +++ b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h @@ -39,11 +39,11 @@ /* A helper macro to 'throw' a java exception. */ #define THROW(env, exception_name, message) \ { \ - jclass ecls = (*env)->FindClass(env, exception_name); \ - if (ecls) { \ - (*env)->ThrowNew(env, ecls, message); \ - (*env)->DeleteLocalRef(env, ecls); \ - } \ + jclass ecls = (*env)->FindClass(env, exception_name); \ + if (ecls) { \ + (*env)->ThrowNew(env, ecls, message); \ + (*env)->DeleteLocalRef(env, ecls); \ + } \ } /* Helper macro to return if an exception is pending */ @@ -82,14 +82,14 @@ static __attribute__ ((unused)) void *do_dlsym(JNIEnv *env, void *handle, const char *symbol) { if (!env || !handle || !symbol) { - THROW(env, "java/lang/InternalError", NULL); - return NULL; + THROW(env, "java/lang/InternalError", NULL); + return NULL; } char *error = NULL; void *func_ptr = dlsym(handle, symbol); if ((error = dlerror()) != NULL) { - THROW(env, "java/lang/UnsatisfiedLinkError", symbol); - return NULL; + THROW(env, "java/lang/UnsatisfiedLinkError", symbol); + return NULL; } return func_ptr; } @@ -124,10 +124,10 @@ void *do_dlsym(JNIEnv *env, void *handle, const char *symbol) { #define unlikely(_c) (_c) /* Disable certain warnings in the native CRC32 code. */ -#pragma warning(disable:4018) // Signed/unsigned mismatch. -#pragma warning(disable:4244) // Possible loss of data in conversion. -#pragma warning(disable:4267) // Possible loss of data. -#pragma warning(disable:4996) // Use of deprecated function. +#pragma warning(disable:4018) // Signed/unsigned mismatch. +#pragma warning(disable:4244) // Possible loss of data in conversion. +#pragma warning(disable:4267) // Possible loss of data. +#pragma warning(disable:4996) // Use of deprecated function. #include <Windows.h> #include <stdio.h> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/158be064/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c ---------------------------------------------------------------------- diff --git a/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c b/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c index 8f0e9b0..56668cb 100644 --- a/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c +++ b/src/main/native/org/apache/commons/crypto/random/OpenSslCryptoRandomNative.c @@ -110,7 +110,7 @@ JNIEXPORT void JNICALL Java_org_apache_commons_crypto_random_OpenSslCryptoRandom #endif #ifdef WINDOWS snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY, \ - GetLastError()); + GetLastError()); #endif THROW(env, "java/lang/UnsatisfiedLinkError", msg); return;
