소스 검색

Add crypto_rand_unmocked, which is crypto_rand without mocking.

There is odd issues with calling crypto_rand from our copy of
ed25519-donna, due to mocking that are not easily resolved.
Yawning Angel 8 년 전
부모
커밋
af898f5475
2개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 10 1
      src/common/crypto.c
  2. 1 0
      src/common/crypto.h

+ 10 - 1
src/common/crypto.c

@@ -2365,10 +2365,19 @@ crypto_seed_rng(void)
 }
 
 /** Write <b>n</b> bytes of strong random data to <b>to</b>. Return 0 on
- * success, -1 on failure.
+ * success, -1 on failure, with support for mocking for unit tests.
  */
 MOCK_IMPL(int,
 crypto_rand, (char *to, size_t n))
+{
+  return crypto_rand_unmocked(to, n);
+}
+
+/** Write <b>n</b> bytes of strong random data to <b>to</b>. Return 0 on
+ * success, -1 on failure.  Most callers will want crypto_rand instead.
+ */
+int
+crypto_rand_unmocked(char *to, size_t n)
 {
   int r;
   tor_assert(n < INT_MAX);

+ 1 - 0
src/common/crypto.h

@@ -260,6 +260,7 @@ int crypto_expand_key_material_rfc5869_sha256(
 /* random numbers */
 int crypto_seed_rng(void);
 MOCK_DECL(int,crypto_rand,(char *to, size_t n));
+int crypto_rand_unmocked(char *to, size_t n);
 int crypto_strongest_rand(uint8_t *out, size_t out_len);
 int crypto_rand_int(unsigned int max);
 int crypto_rand_int_range(unsigned int min, unsigned int max);