[src/trunk]: src/crypto/external/bsd/openssh/dist revert previous

[spz <spz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55b5042e1232
branches:  trunk
changeset: 761682:55b5042e1232
user:      spz <spz%NetBSD.org@localhost>
date:      Sat Feb 05 06:42:44 2011 +0000

description:
revert previous

diffstat:

 crypto/external/bsd/openssh/dist/key.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 0873d4276771 -r 55b5042e1232 crypto/external/bsd/openssh/dist/key.c
--- a/crypto/external/bsd/openssh/dist/key.c    Sat Feb 05 06:23:58 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/key.c    Sat Feb 05 06:42:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.6 2011/02/05 06:23:58 spz Exp $      */
+/*     $NetBSD: key.c,v 1.7 2011/02/05 06:42:44 spz Exp $      */
 /* $OpenBSD: key.c,v 1.90 2010/07/13 23:13:16 djm Exp $ */
 /*
  * read_bignum():
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: key.c,v 1.6 2011/02/05 06:23:58 spz Exp $");
+__RCSID("$NetBSD: key.c,v 1.7 2011/02/05 06:42:44 spz Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 
@@ -1514,10 +1514,7 @@
        buffer_put_cstring(&k->cert->certblob, key_ssh_name(k));
 
        /* -v01 certs put nonce first */
-       /*arc4random_buf(&nonce, sizeof(nonce));*/
-       for (i = 0; i < sizeof(nonce); i += 4)
-               *(uint32_t *)&(nonce[i]) = arc4random();
-
+       arc4random_buf(&nonce, sizeof(nonce));
        if (k->type == KEY_DSA_CERT || k->type == KEY_RSA_CERT) {
                buffer_put_string(&k->cert->certblob, nonce, sizeof(nonce));
        }