You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/07/22 01:56:53 UTC

svn commit: r1612436 - in /hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common: CHANGES-fs-encryption.txt src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c

Author: cmccabe
Date: Mon Jul 21 23:56:53 2014
New Revision: 1612436

URL: http://svn.apache.org/r1612436
Log:
HADOOP-10871. incorrect prototype in OpensslSecureRandom.c (cmccabe)

Modified:
    hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt
    hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c

Modified: hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt?rev=1612436&r1=1612435&r2=1612436&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt (original)
+++ hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt Mon Jul 21 23:56:53 2014
@@ -43,3 +43,5 @@ fs-encryption (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+
+    HADOOP-10871. incorrect prototype in OpensslSecureRandom.c (cmccabe)

Modified: hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c?rev=1612436&r1=1612435&r2=1612436&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c (original)
+++ hadoop/common/branches/fs-encryption/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c Mon Jul 21 23:56:53 2014
@@ -82,7 +82,7 @@ static __dlsym_RAND_bytes dlsym_RAND_byt
 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_h
                       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(
  * 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 *e
 static int openssl_rand_bytes(unsigned char *buf, int num)
 {
   return dlsym_RAND_bytes(buf, num);
-}
\ No newline at end of file
+}