* New upstream release (http://www.openssh.com/txt/release-5.6):

  - Added a ControlPersist option to ssh_config(5) that automatically
    starts a background ssh(1) multiplex master when connecting.  This
    connection can stay alive indefinitely, or can be set to automatically
    close after a user-specified duration of inactivity (closes: #335697,
    #350898, #454787, #500573, #550262).
  - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
    HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
    Match blocks (closes: #549858).
  - sftp(1): fix ls in working directories that contain globbing
    characters in their pathnames (LP: #530714).

1 files changed, 2 insertions, 2 deletions

diff --git a/jpake.c b/jpake.c
index 130661069..cdf65f509 100644
--- a/jpake.c
+++ b/jpake.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jpake.c,v 1.2 2009/03/05 07:18:19 djm Exp $ */
+/* $OpenBSD: jpake.c,v 1.4 2010/07/13 23:13:16 djm Exp $ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
  *
@@ -434,7 +434,7 @@ jpake_check_confirm(const BIGNUM *k,
         if (peer_confirm_hash_len != expected_confirm_hash_len)
                 error("%s: confirmation length mismatch (my %u them %u)",
                     __func__, expected_confirm_hash_len, peer_confirm_hash_len);
-        else if (memcmp(peer_confirm_hash, expected_confirm_hash,
+        else if (timingsafe_bcmp(peer_confirm_hash, expected_confirm_hash,
             expected_confirm_hash_len) == 0)
                 success = 1;
         bzero(expected_confirm_hash, expected_confirm_hash_len);