tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

re-enable ed25519-certs if compiled w/o openssl; ok djm

Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49
This commit is contained in:
markus@openbsd.org 2015-07-09 09:49:46 +00:00 committed by Damien Miller
parent c355bf306a
commit 16db0a7ee9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.115 2015/07/03 03:43:18 djm Exp $ */ /* $OpenBSD: authfile.c,v 1.116 2015/07/09 09:49:46 markus Exp $ */
/* /*
* Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
* *
@ -39,13 +39,13 @@
#include <limits.h> #include <limits.h>
#include "cipher.h" #include "cipher.h"
#include "key.h"
#include "ssh.h" #include "ssh.h"
#include "log.h" #include "log.h"
#include "authfile.h" #include "authfile.h"
#include "rsa.h" #include "rsa.h"
#include "misc.h" #include "misc.h"
#include "atomicio.h" #include "atomicio.h"
#include "sshkey.h"
#include "sshbuf.h" #include "sshbuf.h"
#include "ssherr.h" #include "ssherr.h"
#include "krl.h" #include "krl.h"
@ -448,8 +448,8 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase,
case KEY_RSA: case KEY_RSA:
case KEY_DSA: case KEY_DSA:
case KEY_ECDSA: case KEY_ECDSA:
case KEY_ED25519:
#endif /* WITH_OPENSSL */ #endif /* WITH_OPENSSL */
case KEY_ED25519:
case KEY_UNSPEC: case KEY_UNSPEC:
break; break;
default: default: