summaryrefslogtreecommitdiff
path: root/src/lib/crypt_ops
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-10-14 15:31:52 -0400
committerNick Mathewson <nickm@torproject.org>2018-10-14 15:31:52 -0400
commit2dccef0eb490fa7d8fabc0d93e37d6635910f174 (patch)
tree65138098218cb4b11ffcbd3f6ac90501c45e2e99 /src/lib/crypt_ops
parent2c5c17510acf0cbd0eeb874a2f4c62203bf9392f (diff)
parent6925b61cfdf50a5686de02645b04b269c031f05d (diff)
downloadtor-2dccef0eb490fa7d8fabc0d93e37d6635910f174.tar.gz
tor-2dccef0eb490fa7d8fabc0d93e37d6635910f174.zip
Merge branch 'bug27772_squashed'
Diffstat (limited to 'src/lib/crypt_ops')
-rw-r--r--src/lib/crypt_ops/crypto_pwbox.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/crypt_ops/crypto_pwbox.c b/src/lib/crypt_ops/crypto_pwbox.c
index 2377f216a0..91536e891b 100644
--- a/src/lib/crypt_ops/crypto_pwbox.c
+++ b/src/lib/crypt_ops/crypto_pwbox.c
@@ -61,6 +61,7 @@ crypto_pwbox(uint8_t **out, size_t *outlen_out,
int rv;
enc = pwbox_encoded_new();
+ tor_assert(enc);
pwbox_encoded_setlen_skey_header(enc, S2K_MAXLEN);