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 

fix compilation with OPENSSL=no; ok dtucker@
This commit is contained in:
djm@openbsd.org 2015-04-27 01:52:30 +00:00 committed by Damien Miller
parent a4b9d2ce1e
commit 734226b448
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.146 2015/04/17 04:32:31 djm Exp $ */ /* $OpenBSD: monitor.c,v 1.147 2015/04/27 01:52:30 djm Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>

18
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.210 2015/03/24 20:10:08 markus Exp $ */ /* $OpenBSD: packet.c,v 1.211 2015/04/27 01:52:30 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -792,7 +792,9 @@ ssh_packet_set_compress_hooks(struct ssh *ssh, void *ctx,
void void
ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number) ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number)
{ {
#ifdef WITH_SSH1 #ifndef WITH_SSH1
fatal("no SSH protocol 1 support");
#else /* WITH_SSH1 */
struct session_state *state = ssh->state; struct session_state *state = ssh->state;
const struct sshcipher *cipher = cipher_by_number(number); const struct sshcipher *cipher = cipher_by_number(number);
int r; int r;
@ -2733,13 +2735,14 @@ sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v)
return sshbuf_put_stringb(ssh->state->outgoing_packet, v); return sshbuf_put_stringb(ssh->state->outgoing_packet, v);
} }
#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) #ifdef WITH_OPENSSL
#ifdef OPENSSL_HAS_ECC
int int
sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g) sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g)
{ {
return sshbuf_put_ec(ssh->state->outgoing_packet, v, g); return sshbuf_put_ec(ssh->state->outgoing_packet, v, g);
} }
#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ #endif /* OPENSSL_HAS_ECC */
#ifdef WITH_SSH1 #ifdef WITH_SSH1
int int
@ -2749,7 +2752,6 @@ sshpkt_put_bignum1(struct ssh *ssh, const BIGNUM *v)
} }
#endif /* WITH_SSH1 */ #endif /* WITH_SSH1 */
#ifdef WITH_OPENSSL
int int
sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v) sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v)
{ {
@ -2801,13 +2803,14 @@ sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp)
return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp); return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp);
} }
#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) #ifdef WITH_OPENSSL
#ifdef OPENSSL_HAS_ECC
int int
sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g) sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g)
{ {
return sshbuf_get_ec(ssh->state->incoming_packet, v, g); return sshbuf_get_ec(ssh->state->incoming_packet, v, g);
} }
#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ #endif /* OPENSSL_HAS_ECC */
#ifdef WITH_SSH1 #ifdef WITH_SSH1
int int
@ -2817,7 +2820,6 @@ sshpkt_get_bignum1(struct ssh *ssh, BIGNUM *v)
} }
#endif /* WITH_SSH1 */ #endif /* WITH_SSH1 */
#ifdef WITH_OPENSSL
int int
sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v) sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v)
{ {

5
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.270 2015/04/24 01:36:01 deraadt Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.271 2015/04/27 01:52:30 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -183,8 +183,7 @@ static void
type_bits_valid(int type, const char *name, u_int32_t *bitsp) type_bits_valid(int type, const char *name, u_int32_t *bitsp)
{ {
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
u_int maxbits; u_int maxbits, nid;
int nid;
#endif #endif
if (type == KEY_UNSPEC) if (type == KEY_UNSPEC)