diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-04-27 01:52:30 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:19:05 +1000 |
commit | 734226b4480a6c736096c729fcf6f391400599c7 (patch) | |
tree | 2710831f899f923443818bc6b009ff1ddd924837 /packet.c | |
parent | a4b9d2ce1eb7703eaf0809b0c8a82ded8aa4f1c6 (diff) |
upstream commit
fix compilation with OPENSSL=no; ok dtucker@
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.210 2015/03/24 20:10:08 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.211 2015/04/27 01:52:30 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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, | |||
792 | void | 792 | void |
793 | ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number) | 793 | ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number) |
794 | { | 794 | { |
795 | #ifdef WITH_SSH1 | 795 | #ifndef WITH_SSH1 |
796 | fatal("no SSH protocol 1 support"); | ||
797 | #else /* WITH_SSH1 */ | ||
796 | struct session_state *state = ssh->state; | 798 | struct session_state *state = ssh->state; |
797 | const struct sshcipher *cipher = cipher_by_number(number); | 799 | const struct sshcipher *cipher = cipher_by_number(number); |
798 | int r; | 800 | int r; |
@@ -2733,13 +2735,14 @@ sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v) | |||
2733 | return sshbuf_put_stringb(ssh->state->outgoing_packet, v); | 2735 | return sshbuf_put_stringb(ssh->state->outgoing_packet, v); |
2734 | } | 2736 | } |
2735 | 2737 | ||
2736 | #if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) | 2738 | #ifdef WITH_OPENSSL |
2739 | #ifdef OPENSSL_HAS_ECC | ||
2737 | int | 2740 | int |
2738 | sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g) | 2741 | sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g) |
2739 | { | 2742 | { |
2740 | return sshbuf_put_ec(ssh->state->outgoing_packet, v, g); | 2743 | return sshbuf_put_ec(ssh->state->outgoing_packet, v, g); |
2741 | } | 2744 | } |
2742 | #endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ | 2745 | #endif /* OPENSSL_HAS_ECC */ |
2743 | 2746 | ||
2744 | #ifdef WITH_SSH1 | 2747 | #ifdef WITH_SSH1 |
2745 | int | 2748 | int |
@@ -2749,7 +2752,6 @@ sshpkt_put_bignum1(struct ssh *ssh, const BIGNUM *v) | |||
2749 | } | 2752 | } |
2750 | #endif /* WITH_SSH1 */ | 2753 | #endif /* WITH_SSH1 */ |
2751 | 2754 | ||
2752 | #ifdef WITH_OPENSSL | ||
2753 | int | 2755 | int |
2754 | sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v) | 2756 | sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v) |
2755 | { | 2757 | { |
@@ -2801,13 +2803,14 @@ sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp) | |||
2801 | return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp); | 2803 | return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp); |
2802 | } | 2804 | } |
2803 | 2805 | ||
2804 | #if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) | 2806 | #ifdef WITH_OPENSSL |
2807 | #ifdef OPENSSL_HAS_ECC | ||
2805 | int | 2808 | int |
2806 | sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g) | 2809 | sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g) |
2807 | { | 2810 | { |
2808 | return sshbuf_get_ec(ssh->state->incoming_packet, v, g); | 2811 | return sshbuf_get_ec(ssh->state->incoming_packet, v, g); |
2809 | } | 2812 | } |
2810 | #endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */ | 2813 | #endif /* OPENSSL_HAS_ECC */ |
2811 | 2814 | ||
2812 | #ifdef WITH_SSH1 | 2815 | #ifdef WITH_SSH1 |
2813 | int | 2816 | int |
@@ -2817,7 +2820,6 @@ sshpkt_get_bignum1(struct ssh *ssh, BIGNUM *v) | |||
2817 | } | 2820 | } |
2818 | #endif /* WITH_SSH1 */ | 2821 | #endif /* WITH_SSH1 */ |
2819 | 2822 | ||
2820 | #ifdef WITH_OPENSSL | ||
2821 | int | 2823 | int |
2822 | sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v) | 2824 | sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v) |
2823 | { | 2825 | { |