summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
committerColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
commit651211fd4a199b299540c00c54a46e27fadb04be (patch)
tree26dbf99c8861a7f94d0c00be71b38869728ebd81 /sshkey.c
parent58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (diff)
parente91346dc2bbf460246df2ab591b7613908c1b0ad (diff)
Import openssh_7.1p1.orig.tar.gz
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sshkey.c b/sshkey.c
index dbb16e2fd..32dd8f225 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.c,v 1.20 2015/07/03 03:43:18 djm Exp $ */ 1/* $OpenBSD: sshkey.c,v 1.21 2015/08/19 23:19:01 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved. 4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -1556,7 +1556,6 @@ dsa_generate_private_key(u_int bits, DSA **dsap)
1556 *dsap = NULL; 1556 *dsap = NULL;
1557 if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL, 1557 if (!DSA_generate_parameters_ex(private, bits, NULL, 0, NULL,
1558 NULL, NULL) || !DSA_generate_key(private)) { 1558 NULL, NULL) || !DSA_generate_key(private)) {
1559 DSA_free(private);
1560 ret = SSH_ERR_LIBCRYPTO_ERROR; 1559 ret = SSH_ERR_LIBCRYPTO_ERROR;
1561 goto out; 1560 goto out;
1562 } 1561 }