소스 검색

HADOOP-10871. incorrect prototype in OpensslSecureRandom.c (cmccabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612436 13f79535-47bb-0310-9956-ffa450edef68
Colin McCabe 11 년 전
부모
커밋
a4984f5f0a

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt

@@ -43,3 +43,5 @@ fs-encryption (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+
+    HADOOP-10871. incorrect prototype in OpensslSecureRandom.c (cmccabe)

+ 4 - 4
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c

@@ -82,7 +82,7 @@ static __dlsym_RAND_bytes dlsym_RAND_bytes;
 static __dlsym_ERR_get_error dlsym_ERR_get_error;
 #endif
 
-static ENGINE * openssl_rand_init();
+static ENGINE * openssl_rand_init(void);
 static void openssl_rand_clean(ENGINE *eng, int clean_locks);
 static int openssl_rand_bytes(unsigned char *buf, int num);
 
@@ -157,7 +157,7 @@ JNIEXPORT void JNICALL Java_org_apache_hadoop_crypto_random_OpensslSecureRandom_
                       env, openssl, "ERR_get_error");
 #endif
 
-  openssl_rand_init(env);
+  openssl_rand_init();
 }
 
 JNIEXPORT jboolean JNICALL Java_org_apache_hadoop_crypto_random_OpensslSecureRandom_nextRandBytes___3B
@@ -283,7 +283,7 @@ static unsigned long pthreads_thread_id(void)
  * If using an Intel chipset with RDRAND, the high-performance hardware
  * random number generator will be used.
  */
-static ENGINE * openssl_rand_init()
+static ENGINE * openssl_rand_init(void)
 {
   locks_setup();
   
@@ -332,4 +332,4 @@ static void openssl_rand_clean(ENGINE *eng, int clean_locks)
 static int openssl_rand_bytes(unsigned char *buf, int num)
 {
   return dlsym_RAND_bytes(buf, num);
-}
+}