diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
tree | 138e715c25661825457c7280cd66e3f4853d474c /jpake.c | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) |
merge 5.6p1
Diffstat (limited to 'jpake.c')
-rw-r--r-- | jpake.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: jpake.c,v 1.2 2009/03/05 07:18:19 djm Exp $ */ | 1 | /* $OpenBSD: jpake.c,v 1.4 2010/07/13 23:13:16 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 3 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
4 | * | 4 | * |
@@ -434,7 +434,7 @@ jpake_check_confirm(const BIGNUM *k, | |||
434 | if (peer_confirm_hash_len != expected_confirm_hash_len) | 434 | if (peer_confirm_hash_len != expected_confirm_hash_len) |
435 | error("%s: confirmation length mismatch (my %u them %u)", | 435 | error("%s: confirmation length mismatch (my %u them %u)", |
436 | __func__, expected_confirm_hash_len, peer_confirm_hash_len); | 436 | __func__, expected_confirm_hash_len, peer_confirm_hash_len); |
437 | else if (memcmp(peer_confirm_hash, expected_confirm_hash, | 437 | else if (timingsafe_bcmp(peer_confirm_hash, expected_confirm_hash, |
438 | expected_confirm_hash_len) == 0) | 438 | expected_confirm_hash_len) == 0) |
439 | success = 1; | 439 | success = 1; |
440 | bzero(expected_confirm_hash, expected_confirm_hash_len); | 440 | bzero(expected_confirm_hash, expected_confirm_hash_len); |