summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--authfile.c4
-rw-r--r--authfile.h2
-rw-r--r--debian/patches/ssh-vulnkey.patch6
3 files changed, 6 insertions, 6 deletions
diff --git a/authfile.c b/authfile.c
index deac28f6a..e748ec0a2 100644
--- a/authfile.c
+++ b/authfile.c
@@ -817,7 +817,7 @@ key_in_file(Key *key, const char *filename, int strict_type)
817 817
818/* Scan a blacklist of known-vulnerable keys in blacklist_file. */ 818/* Scan a blacklist of known-vulnerable keys in blacklist_file. */
819static int 819static int
820blacklisted_key_in_file(const Key *key, const char *blacklist_file, char **fp) 820blacklisted_key_in_file(Key *key, const char *blacklist_file, char **fp)
821{ 821{
822 int fd = -1; 822 int fd = -1;
823 char *dgst_hex = NULL; 823 char *dgst_hex = NULL;
@@ -922,7 +922,7 @@ out:
922 * its fingerprint is returned in *fp, unless fp is NULL. 922 * its fingerprint is returned in *fp, unless fp is NULL.
923 */ 923 */
924int 924int
925blacklisted_key(const Key *key, char **fp) 925blacklisted_key(Key *key, char **fp)
926{ 926{
927 Key *public; 927 Key *public;
928 char *blacklist_file; 928 char *blacklist_file;
diff --git a/authfile.h b/authfile.h
index 094b855bd..e66d1f573 100644
--- a/authfile.h
+++ b/authfile.h
@@ -26,6 +26,6 @@ Key *key_load_private_pem(int, int, const char *, char **);
26int key_perm_ok(int, const char *); 26int key_perm_ok(int, const char *);
27int key_in_file(Key *, const char *, int); 27int key_in_file(Key *, const char *, int);
28 28
29int blacklisted_key(const Key *key, char **fp); 29int blacklisted_key(Key *key, char **fp);
30 30
31#endif 31#endif
diff --git a/debian/patches/ssh-vulnkey.patch b/debian/patches/ssh-vulnkey.patch
index ecb6e0c64..9f9db5f4e 100644
--- a/debian/patches/ssh-vulnkey.patch
+++ b/debian/patches/ssh-vulnkey.patch
@@ -229,7 +229,7 @@ Index: b/authfile.c
229 229
230+/* Scan a blacklist of known-vulnerable keys in blacklist_file. */ 230+/* Scan a blacklist of known-vulnerable keys in blacklist_file. */
231+static int 231+static int
232+blacklisted_key_in_file(const Key *key, const char *blacklist_file, char **fp) 232+blacklisted_key_in_file(Key *key, const char *blacklist_file, char **fp)
233+{ 233+{
234+ int fd = -1; 234+ int fd = -1;
235+ char *dgst_hex = NULL; 235+ char *dgst_hex = NULL;
@@ -334,7 +334,7 @@ Index: b/authfile.c
334+ * its fingerprint is returned in *fp, unless fp is NULL. 334+ * its fingerprint is returned in *fp, unless fp is NULL.
335+ */ 335+ */
336+int 336+int
337+blacklisted_key(const Key *key, char **fp) 337+blacklisted_key(Key *key, char **fp)
338+{ 338+{
339+ Key *public; 339+ Key *public;
340+ char *blacklist_file; 340+ char *blacklist_file;
@@ -372,7 +372,7 @@ Index: b/authfile.h
372 int key_perm_ok(int, const char *); 372 int key_perm_ok(int, const char *);
373 int key_in_file(Key *, const char *, int); 373 int key_in_file(Key *, const char *, int);
374 374
375+int blacklisted_key(const Key *key, char **fp); 375+int blacklisted_key(Key *key, char **fp);
376+ 376+
377 #endif 377 #endif
378Index: b/pathnames.h 378Index: b/pathnames.h