summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 14:24:09 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 14:24:09 +1000
commit1f0311c7c7d10c94ff7f823de9c5b2ed79368b14 (patch)
treeae708c2a25f84a04bcb04f2dbf3e8039e0f692bc /packet.c
parentc5893785564498cea73cb60d2cf199490483e080 (diff)
- markus@cvs.openbsd.org 2014/04/29 18:01:49
[auth.c authfd.c authfile.c bufaux.c cipher.c cipher.h hostfile.c] [kex.c key.c mac.c monitor.c monitor_wrap.c myproposal.h packet.c] [roaming_client.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c] [ssh-pkcs11.h ssh.c sshconnect.c sshconnect2.c sshd.c] make compiling against OpenSSL optional (make OPENSSL=no); reduces algorithms to curve25519, aes-ctr, chacha, ed25519; allows us to explore further options; with and ok djm
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/packet.c b/packet.c
index a70acf8b4..c7c18f308 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.194 2014/04/28 03:09:18 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.195 2014/04/29 18:01:49 markus 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
@@ -630,6 +630,7 @@ packet_put_raw(const void *buf, u_int len)
630 buffer_append(&active_state->outgoing_packet, buf, len); 630 buffer_append(&active_state->outgoing_packet, buf, len);
631} 631}
632 632
633#ifdef WITH_OPENSSL
633void 634void
634packet_put_bignum(BIGNUM * value) 635packet_put_bignum(BIGNUM * value)
635{ 636{
@@ -641,6 +642,7 @@ packet_put_bignum2(BIGNUM * value)
641{ 642{
642 buffer_put_bignum2(&active_state->outgoing_packet, value); 643 buffer_put_bignum2(&active_state->outgoing_packet, value);
643} 644}
645#endif
644 646
645#ifdef OPENSSL_HAS_ECC 647#ifdef OPENSSL_HAS_ECC
646void 648void
@@ -1569,6 +1571,7 @@ packet_get_int64(void)
1569 * must have been initialized before this call. 1571 * must have been initialized before this call.
1570 */ 1572 */
1571 1573
1574#ifdef WITH_OPENSSL
1572void 1575void
1573packet_get_bignum(BIGNUM * value) 1576packet_get_bignum(BIGNUM * value)
1574{ 1577{
@@ -1598,6 +1601,7 @@ packet_get_raw(u_int *length_ptr)
1598 *length_ptr = bytes; 1601 *length_ptr = bytes;
1599 return buffer_ptr(&active_state->incoming_packet); 1602 return buffer_ptr(&active_state->incoming_packet);
1600} 1603}
1604#endif
1601 1605
1602int 1606int
1603packet_remaining(void) 1607packet_remaining(void)