premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

properly report errors when failing to generate randomness

This commit is contained in:
Arvid Norberg 2015-05-09 04:08:32 +00:00
parent 3218931495
commit b3d7668e7a
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ed25519/src/seed.cpp
View File

@ -1,6 +1,8 @@
// ignore warnings in this file
#include "libtorrent/aux_/disable_warnings_push.hpp"
#include <boost/system/error_code.hpp>
#include <boost/system/system_error.hpp>
#include "libtorrent/ed25519.hpp"
#ifndef ED25519_NO_SEED
@ -12,17 +14,19 @@
#include <stdio.h>
#endif
int ed25519_create_seed(unsigned char *seed) {
void ed25519_create_seed(unsigned char *seed) {
#ifdef _WIN32
HCRYPTPROV prov;
if (!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
return 1;
throw boost::system::system_error(boost::system::error_code(GetLastError()
, boost::system::system_category()));
}
if (!CryptGenRandom(prov, 32, seed)) {
CryptReleaseContext(prov, 0);
return 1;
throw boost::system::system_error(boost::system::error_code(GetLastError()
, boost::system::system_category()));
}
CryptReleaseContext(prov, 0);
@ -30,14 +34,17 @@ int ed25519_create_seed(unsigned char *seed) {
FILE *f = fopen("/dev/urandom", "rb");
if (f == NULL) {
return 1;
throw boost::system::system_error(boost::system::error_code(errno, boost::system::generic_category()));
}
int read = fread(seed, 1, 32, f);
if (read != 32) {
fclose(f);
throw boost::system::system_error(boost::system::error_code(errno, boost::system::generic_category()));
}
fread(seed, 1, 32, f);
fclose(f);
#endif
return 0;
}
#endif

2
include/libtorrent/ed25519.hpp
View File

@ -17,7 +17,7 @@ enum
extern "C" {
#ifndef ED25519_NO_SEED
int TORRENT_EXPORT ed25519_create_seed(unsigned char *seed);
void TORRENT_EXPORT ed25519_create_seed(unsigned char *seed);
#endif
void TORRENT_EXPORT ed25519_create_keypair(unsigned char *public_key, unsigned char *private_key, const unsigned char *seed);