diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
commit | eab78da6a54225de06271d9c8da650f04a55ed88 (patch) | |
tree | aa258ca77515939f6d89317ff67fbcb0bca08b24 /ssh-pkcs11-helper.c | |
parent | a26f5de49df59322fde07f7be91b3e3969c9c238 (diff) | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs.
- Allow "PermitOpen none" to refuse all port-forwarding requests
(closes: #543683).
Diffstat (limited to 'ssh-pkcs11-helper.c')
-rw-r--r-- | ssh-pkcs11-helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c index cd33515f6..fcb5defc0 100644 --- a/ssh-pkcs11-helper.c +++ b/ssh-pkcs11-helper.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11-helper.c,v 1.3 2010/02/24 06:12:53 djm Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11-helper.c,v 1.4 2012/07/02 12:13:26 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -168,13 +168,13 @@ process_sign(void) | |||
168 | { | 168 | { |
169 | u_char *blob, *data, *signature = NULL; | 169 | u_char *blob, *data, *signature = NULL; |
170 | u_int blen, dlen, slen = 0; | 170 | u_int blen, dlen, slen = 0; |
171 | int ok = -1, flags, ret; | 171 | int ok = -1, ret; |
172 | Key *key, *found; | 172 | Key *key, *found; |
173 | Buffer msg; | 173 | Buffer msg; |
174 | 174 | ||
175 | blob = get_string(&blen); | 175 | blob = get_string(&blen); |
176 | data = get_string(&dlen); | 176 | data = get_string(&dlen); |
177 | flags = get_int(); /* XXX ignore */ | 177 | (void)get_int(); /* XXX ignore flags */ |
178 | 178 | ||
179 | if ((key = key_from_blob(blob, blen)) != NULL) { | 179 | if ((key = key_from_blob(blob, blen)) != NULL) { |
180 | if ((found = lookup_key(key)) != NULL) { | 180 | if ((found = lookup_key(key)) != NULL) { |