# HG changeset patch # User Ivo Smits # Date 1310654961 -7200 # Node ID 765303f4f2da16cb1af0d00498e7358ca49a91c9 # Parent a1fc155ca80ba2b1f14300833efa961b8e45bf72 Attempt to fix randombytes.c for unpatched NaCl diff -r a1fc155ca80b -r 765303f4f2da nacl.c --- a/nacl.c Thu Jul 14 16:32:23 2011 +0200 +++ b/nacl.c Thu Jul 14 16:49:21 2011 +0200 @@ -43,23 +43,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 2) ZEND_ARG_INFO(1, zsk) ZEND_ARG_INFO(0, rb) -ZEND_END_ARG_INFO() +ZEND_END_ARG_INFO() #else ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_box_curve25519xsalsa20poly1305_keypair, 0, 0, 1) ZEND_ARG_INFO(1, zsk) ZEND_ARG_INFO(0, rb) -ZEND_END_ARG_INFO() +ZEND_END_ARG_INFO() #endif #if defined crypto_sign_edwards25519sha512batch_KEYPAIRRANDOMBYTES ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 2) ZEND_ARG_INFO(1, zsk) ZEND_ARG_INFO(0, rb) -ZEND_END_ARG_INFO() +ZEND_END_ARG_INFO() #else ZEND_BEGIN_ARG_INFO_EX(arginfo_nacl_crypto_sign_edwards25519sha512batch_keypair, 0, 0, 1) ZEND_ARG_INFO(1, zsk) ZEND_ARG_INFO(0, rb) -ZEND_END_ARG_INFO() +ZEND_END_ARG_INFO() #endif static function_entry nacl_functions[] = { diff -r a1fc155ca80b -r 765303f4f2da randombytes.c --- a/randombytes.c Thu Jul 14 16:32:23 2011 +0200 +++ b/randombytes.c Thu Jul 14 16:49:21 2011 +0200 @@ -1,8 +1,8 @@ #include void randombytes(unsigned char *x,unsigned long long xlen) { - int fd = open("/dev/urandom",O_RDONLY); - if (fd != -1) { + FILE* fd = fopen("/dev/urandom", "rb"); + if (fd != NULL) { fread(x, 1, xlen, fd); fclose(fd); } else {