Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Colin McCabe 2014-07-21 23:56:53 +00:00
parent cb20bb6117
commit a4984f5f0a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES-fs-encryption.txt
View File

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

6
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
View File

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