Module Name: src Committed By: spz Date: Sat Feb 5 06:42:45 UTC 2011
Modified Files: src/crypto/external/bsd/openssh/dist: key.c Log Message: revert previous To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/dist/key.c diff -u src/crypto/external/bsd/openssh/dist/key.c:1.6 src/crypto/external/bsd/openssh/dist/key.c:1.7 --- src/crypto/external/bsd/openssh/dist/key.c:1.6 Sat Feb 5 06:23:58 2011 +++ src/crypto/external/bsd/openssh/dist/key.c Sat Feb 5 06:42:44 2011 @@ -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)); }