diff options
-rw-r--r-- | ssh-agent.c | 3 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 72d538e7c..b987562b9 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.217 2017/03/15 02:25:09 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.218 2017/03/15 03:52:30 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -857,6 +857,7 @@ process_remove_smartcard_key(SocketEntry *e) | |||
857 | else | 857 | else |
858 | error("process_remove_smartcard_key:" | 858 | error("process_remove_smartcard_key:" |
859 | " pkcs11_del_provider failed"); | 859 | " pkcs11_del_provider failed"); |
860 | send: | ||
860 | free(provider); | 861 | free(provider); |
861 | send_status(e, success); | 862 | send_status(e, success); |
862 | } | 863 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.484 2017/03/15 02:19:09 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.485 2017/03/15 03:52:30 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1679,7 +1679,7 @@ main(int ac, char **av) | |||
1679 | if ((pubkey != NULL && pubkey->type == KEY_RSA1) || | 1679 | if ((pubkey != NULL && pubkey->type == KEY_RSA1) || |
1680 | (key != NULL && key->type == KEY_RSA1)) { | 1680 | (key != NULL && key->type == KEY_RSA1)) { |
1681 | verbose("Ignoring RSA1 key %s", | 1681 | verbose("Ignoring RSA1 key %s", |
1682 | options.host_key_files[i]) | 1682 | options.host_key_files[i]); |
1683 | key_free(key); | 1683 | key_free(key); |
1684 | key_free(pubkey); | 1684 | key_free(pubkey); |
1685 | continue; | 1685 | continue; |