diff options
| author | Adam Langley <agl@google.com> | 2015-03-30 14:49:51 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-07 17:50:50 -0700 |
| commit | d059297112922cabb0c674840589be8db821fd9a (patch) | |
| tree | 9c2045d28ec1c8594090f38bc32e9f523dc6c68d /auth2-none.c | |
| parent | f5c67b478bef9992de9e9ec91ce10af4f6205e0d (diff) | |
external/openssh: update to 6.8p1.
In preparation for some updates to external/openssh to make it work with
BoringSSL, this change updates the code to a recent version. The current
version (5.9p1) is coming up on four years old now.
* Confirmed that f5c67b478bef9992de9e9ec91ce10af4f6205e0d matches
OpenSSH 5.9p1 exactly (save for the removal of the scard
subdirectory).
* Downloaded openssh-6.8p1.tar.gz (SHA256:
3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e)
and verified with PGP signature. (I've verified Damien's key in
person previously.)
* Applied changes between f5c67b478bef9992de9e9ec91ce10af4f6205e0d and
OpenSSH 5.9p1 to 6.8p1 and updated the build as best I can. The
ugliest change is probably the duplication of umac.c to umac128.c
because Android conditionally compiles that file twice. See the
comment in those files.
Change-Id: I63cb07a8118afb5a377f116087a0882914cea486
Diffstat (limited to 'auth2-none.c')
| -rw-r--r-- | auth2-none.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/auth2-none.c b/auth2-none.c index 7aae9453..5d59bda3 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-none.c,v 1.16 2010/06/25 08:46:17 djm Exp $ */ +/* $OpenBSD: auth2-none.c,v 1.18 2014/07/15 15:54:14 millert Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -30,9 +30,10 @@ #include <sys/uio.h> #include <fcntl.h> -#include <stdarg.h> #include <string.h> #include <unistd.h> +#include <stdarg.h> +#include <stdio.h> #include "atomicio.h" #include "xmalloc.h" @@ -42,6 +43,7 @@ #include "packet.h" #include "log.h" #include "buffer.h" +#include "misc.h" #include "servconf.h" #include "compat.h" #include "ssh2.h" @@ -61,8 +63,9 @@ userauth_none(Authctxt *authctxt) { none_enabled = 0; packet_check_eom(); -#ifndef ANDROID - /* no password authentication in android */ + + /* no password authentication in Android. */ +#if !defined(ANDROID) if (options.permit_empty_passwd && options.password_authentication) return (PRIVSEP(auth_password(authctxt, ""))); #endif |