[openssh-commits] [openssh] branch master updated (77199d6 -> 226d94d)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

      from  77199d6   upstream commit
       new  c7b4135   upstream commit
       new  0b53416   upstream commit
       new  226d94d   upstream commit

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 226d94d2b7912da8e2a04b03ef6dd68c18dd4bb7
Author: Damien Miller <djm at mindrot.org>
Date:   Tue May 5 19:10:58 2015 +1000

    upstream commit
    
       - tedu at cvs.openbsd.org 2015/01/12 03:20:04
         [bcrypt_pbkdf.c]
         rename blocks to words. bcrypt "blocks" are unrelated to blowfish blocks,
         nor are they the same size.

commit 0b53416bbe6c765d4b8825c2ebc106ee1fabdd4d
Author: Damien Miller <djm at mindrot.org>
Date:   Tue May 5 19:10:23 2015 +1000

    upstream commit
    
       - deraadt at cvs.openbsd.org 2015/01/08 00:30:07
         [bcrypt_pbkdf.c]
         declare a local version of MIN(), call it MINIMUM()

commit c7b4135501f6a8777d00d40f4036dbdc8eb7da9e
Author: Damien Miller <djm at mindrot.org>
Date:   Tue May 5 19:09:46 2015 +1000

    upstream commit
    
       - djm at cvs.openbsd.org 2014/12/30 01:41:43
         [bcrypt_pbkdf.c]
         typo in comment: ouput => output

Summary of changes:
 openbsd-compat/bcrypt_pbkdf.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.