summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/auth-chall.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-02-07 11:38:54 +0000
committerdes <des@FreeBSD.org>2016-02-07 11:38:54 +0000
commit5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0 (patch)
tree4db6899304517c45f13302b0b11d3144c257dada /crypto/openssh/auth-chall.c
parentc76cb9755e8e722ba04e0c26cf28ecc0adeb52de (diff)
downloadFreeBSD-src-5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0.zip
FreeBSD-src-5a18868b2d506b9e2254047d8d9fb9df5b2a8ae0.tar.gz
MFH (r265214, r294333, r294407, r294467): misc prop fixes
MFH (r285975, r287143): register mergeinfo for security fixes MFH (r294497, r294498, r295139): internal documentation MFH (r294328): upgrade to openssh 6.7p1, re-add libwrap MFH (r294332): upgrade to openssh 6.8p1 MFH (r294367): update pam_ssh for api changes MFH (r294909): switch usedns back on MFH (r294336): upgrade to openssh 6.9p1 MFH (r294495): re-enable dsa keys MFH (r294464): upgrade to openssh 7.0p1 MFH (r294496): upgrade to openssh 7.1p2 Approved by: re (gjb) Relnotes: yes
Diffstat (limited to 'crypto/openssh/auth-chall.c')
-rw-r--r--crypto/openssh/auth-chall.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssh/auth-chall.c b/crypto/openssh/auth-chall.c
index 0005aa8..60c9f14 100644
--- a/crypto/openssh/auth-chall.c
+++ b/crypto/openssh/auth-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-chall.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth-chall.c,v 1.14 2014/06/24 01:13:21 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -26,14 +26,16 @@
#include "includes.h"
#include <sys/types.h>
-
#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
#include "xmalloc.h"
#include "key.h"
#include "hostfile.h"
#include "auth.h"
#include "log.h"
+#include "misc.h"
#include "servconf.h"
/* limited protocol v1 interface to kbd-interactive authentication */
OpenPOWER on IntegriCloud