diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-11-15 02:37:24 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-15 13:41:40 +1100 |
commit | 49dc9fa928d77807c53bdc2898db7fb515fe5eb3 (patch) | |
tree | c3bf023584f5564abc940026300ba4e48d8241a5 /sshconnect2.c | |
parent | 22a82712e89bf17c27427aeba15795fb4011a0c2 (diff) |
upstream: close the "touch your security key" notifier on the error
path too
OpenBSD-Commit-ID: c7628bf80505c1aefbb1de7abc8bb5ee51826829
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 85c1c231a..d658ed07b 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.313 2019/11/13 04:47:52 deraadt Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.314 2019/11/15 02:37:24 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1197,7 +1197,6 @@ identity_sign(struct identity *id, u_char **sigp, size_t *lenp, | |||
1197 | debug("%s: sshkey_sign: %s", __func__, ssh_err(r)); | 1197 | debug("%s: sshkey_sign: %s", __func__, ssh_err(r)); |
1198 | goto out; | 1198 | goto out; |
1199 | } | 1199 | } |
1200 | notify_complete(notifier); | ||
1201 | /* | 1200 | /* |
1202 | * PKCS#11 tokens may not support all signature algorithms, | 1201 | * PKCS#11 tokens may not support all signature algorithms, |
1203 | * so check what we get back. | 1202 | * so check what we get back. |
@@ -1209,6 +1208,7 @@ identity_sign(struct identity *id, u_char **sigp, size_t *lenp, | |||
1209 | /* success */ | 1208 | /* success */ |
1210 | r = 0; | 1209 | r = 0; |
1211 | out: | 1210 | out: |
1211 | notify_complete(notifier); | ||
1212 | sshkey_free(prv); | 1212 | sshkey_free(prv); |
1213 | return r; | 1213 | return r; |
1214 | } | 1214 | } |