RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-25 03:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
accidents happen to the best of us; ok djm

Upstream-ID: b7a9dbd71011ffde95e06f6945fe7197dedd1604
This commit is contained in:
deraadt@openbsd.org 2017-03-15 03:52:30 +00:00 committed by Damien Miller
parent 25f837646b
commit 1a321bfdb9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.217 2017/03/15 02:25:09 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.218 2017/03/15 03:52:30 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -857,6 +857,7 @@ process_remove_smartcard_key(SocketEntry *e)
else else
error("process_remove_smartcard_key:" error("process_remove_smartcard_key:"
" pkcs11_del_provider failed"); " pkcs11_del_provider failed");
send:
free(provider); free(provider);
send_status(e, success); send_status(e, success);
} }

4
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.484 2017/03/15 02:19:09 djm Exp $ */ /* $OpenBSD: sshd.c,v 1.485 2017/03/15 03:52:30 deraadt Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1679,7 +1679,7 @@ main(int ac, char **av)
if ((pubkey != NULL && pubkey->type == KEY_RSA1) || if ((pubkey != NULL && pubkey->type == KEY_RSA1) ||
(key != NULL && key->type == KEY_RSA1)) { (key != NULL && key->type == KEY_RSA1)) {
verbose("Ignoring RSA1 key %s", verbose("Ignoring RSA1 key %s",
options.host_key_files[i]) options.host_key_files[i]);
key_free(key); key_free(key);
key_free(pubkey); key_free(pubkey);
continue; continue;