summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-25 11:38:24 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-25 11:38:24 -0400
commit6069c829f90576c04a0802d2a108378a2bbabb7a (patch)
treeaaaf670a9e79384e0d83f5b8a04738636fef9566 /src/or/connection_or.c
parent10b242822490c9873138565bcc8a3565a7dc7014 (diff)
parent418f3d6298beb27e050618e2f59e01d6d3b2f45b (diff)
downloadtor-6069c829f90576c04a0802d2a108378a2bbabb7a.tar.gz
tor-6069c829f90576c04a0802d2a108378a2bbabb7a.zip
Merge branch 'bug19418_029' into maint-0.3.1
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 753148291c..59a9bdffda 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1549,7 +1549,9 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn,
}
if (identity_rcvd) {
- crypto_pk_get_digest(identity_rcvd, digest_rcvd_out);
+ if (crypto_pk_get_digest(identity_rcvd, digest_rcvd_out) < 0) {
+ return -1;
+ }
} else {
memset(digest_rcvd_out, 0, DIGEST_LEN);
}