summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-07-01 13:50:45 +0000
committerDamien Miller <djm@mindrot.org>2017-07-21 14:17:32 +1000
commit83fa3a044891887369ce8b487ce88d713a04df48 (patch)
treef5d227629414d0a30ef14141a5613ed31fd1985c /authfile.c
parent738c73dca2c99ee78c531b4cbeefc2008fe438f0 (diff)
upstream commit
remove post-SSHv1 removal dead code from rsa.c and merge the remaining bit that it still used into ssh-rsa.c; ok markus Upstream-ID: ac8a048d24dcd89594b0052ea5e3404b473bfa2f
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c
index 3481e0b04..d09b700d2 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.126 2017/05/31 09:15:42 deraadt Exp $ */ 1/* $OpenBSD: authfile.c,v 1.127 2017/07/01 13:50:45 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
4 * 4 *
@@ -42,7 +42,6 @@
42#include "ssh.h" 42#include "ssh.h"
43#include "log.h" 43#include "log.h"
44#include "authfile.h" 44#include "authfile.h"
45#include "rsa.h"
46#include "misc.h" 45#include "misc.h"
47#include "atomicio.h" 46#include "atomicio.h"
48#include "sshkey.h" 47#include "sshkey.h"