diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:49:51 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 10:49:51 +0100 |
commit | 56ea360619c4bbe1b604add62d3cbf472392617f (patch) | |
tree | 3d7450c164b851412cb8ca28f87547c62595659d /debian/patches/ssh-vulnkey.patch | |
parent | efd3d4522636ae029488c2e9730b60c88e257d2e (diff) |
ssh-vulnkey.patch: update another call to auth_key_is_revoked
Diffstat (limited to 'debian/patches/ssh-vulnkey.patch')
-rw-r--r-- | debian/patches/ssh-vulnkey.patch | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/patches/ssh-vulnkey.patch b/debian/patches/ssh-vulnkey.patch index c2842a4cf..73a30186b 100644 --- a/debian/patches/ssh-vulnkey.patch +++ b/debian/patches/ssh-vulnkey.patch | |||
@@ -198,15 +198,19 @@ Index: b/auth2-pubkey.c | |||
198 | =================================================================== | 198 | =================================================================== |
199 | --- a/auth2-pubkey.c | 199 | --- a/auth2-pubkey.c |
200 | +++ b/auth2-pubkey.c | 200 | +++ b/auth2-pubkey.c |
201 | @@ -325,7 +325,7 @@ | 201 | @@ -325,9 +325,10 @@ |
202 | int success; | 202 | int success; |
203 | char *file; | 203 | char *file; |
204 | 204 | ||
205 | - if (auth_key_is_revoked(key)) | 205 | - if (auth_key_is_revoked(key)) |
206 | + if (auth_key_is_revoked(key, 0)) | 206 | + if (auth_key_is_revoked(key, 0)) |
207 | return 0; | 207 | return 0; |
208 | if (key_is_cert(key) && auth_key_is_revoked(key->cert->signature_key)) | 208 | - if (key_is_cert(key) && auth_key_is_revoked(key->cert->signature_key)) |
209 | + if (key_is_cert(key) && | ||
210 | + auth_key_is_revoked(key->cert->signature_key, 0)) | ||
209 | return 0; | 211 | return 0; |
212 | |||
213 | success = user_cert_trusted_ca(pw, key); | ||
210 | Index: b/authfile.c | 214 | Index: b/authfile.c |
211 | =================================================================== | 215 | =================================================================== |
212 | --- a/authfile.c | 216 | --- a/authfile.c |