Merge branch 'openj9' of github.com:ibmruntimes/openj9-openjdk-jdk11 …

…into openj9
ibmruntimes · Mar 22, 2019 · 99e419a · 99e419a
2 parents 8b719e0 + 3cd1a58
commit 99e419a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
@@ -415,12 +415,11 @@ AC_DEFUN([CONFIGURE_OPENSSL],
       if test -d "$TOPDIR/openssl" ; then
         OPENSSL_DIR="$TOPDIR/openssl"
         OPENSSL_CFLAGS="-I${OPENSSL_DIR}/include"
-        if test -s "$OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}" ; then
-          BUILD_OPENSSL=no
-        else
-          BUILD_OPENSSL=yes
+        if test "x$BUNDLE_OPENSSL" != x ; then
+            if  ! test -s "$OPENSSL_DIR/${LIBRARY_PREFIX}crypto${SHARED_LIBRARY_SUFFIX}" ; then
+                BUILD_OPENSSL=yes
+            fi
         fi
-
         if test "x$BUNDLE_OPENSSL" = xyes ; then
           OPENSSL_BUNDLE_LIB_PATH="${OPENSSL_DIR}"
         fi

diff --git a/closed/src/java.base/aix/native/libjncrypto/NativeCrypto_md.c b/closed/src/java.base/aix/native/libjncrypto/NativeCrypto_md.c
@@ -37,7 +37,6 @@ void * load_crypto_library() {
     const char *libname102 = "libcrypto.so.1.0.0";
     const char *symlink = "libcrypto.a(libcrypto64.so)";
 
-    char *errorstr;
     result = dlopen (libname111, RTLD_NOW | RTLD_MEMBER);
     if (result == NULL) {
         result = dlopen (libname110, RTLD_NOW);

diff --git a/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c b/closed/src/java.base/share/native/libjncrypto/NativeCrypto.c
@@ -536,7 +536,7 @@ JNIEXPORT void JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_DigestReset
  *
  * Class:     jdk_crypto_jniprovider_NativeCrypto
  * Method:    CBCCreateContext
- * Signature: (JJ)J
+ * Signature: ()J
  */
 JNIEXPORT jlong JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_CBCCreateContext
   (JNIEnv *env, jclass thisObj) {
@@ -556,7 +556,7 @@ JNIEXPORT jlong JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_CBCCreateContex
  *
  * Class:     jdk_crypto_jniprovider_NativeCrypto
  * Method:    CBCDestroyContext
- * Signature: (J)J
+ * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_CBCDestroyContext
   (JNIEnv *env, jclass thisObj, jlong c) {
@@ -574,7 +574,7 @@ JNIEXPORT jint JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_CBCDestroyContex
  *
  * Class:     jdk_crypto_jniprovider_NativeCrypto
  * Method:    CBCInit
- * Signature: (JI[BI[BI)V
+ * Signature: (JI[BI[BI)I
  */
 JNIEXPORT jint JNICALL Java_jdk_crypto_jniprovider_NativeCrypto_CBCInit
   (JNIEnv *env, jclass thisObj, jlong c, jint mode, jbyteArray iv, jint iv_len,

diff --git a/closed/src/java.base/share/native/libjncrypto/NativeCrypto_md.h b/closed/src/java.base/share/native/libjncrypto/NativeCrypto_md.h
@@ -29,4 +29,4 @@ void * load_crypto_library();
 void   unload_crypto_library(void *handle);
 void * find_crypto_symbol(void *handle, const char *symname);
 
-#endif
+#endif /* NATIVECRYPTO_MD_H */