repair --without-openssl; broken in refactor
diff --git a/packet.c b/packet.c
index b29d875..b1219c8 100644
--- a/packet.c
+++ b/packet.c
@@ -788,10 +788,10 @@
* encrypted independently of each other.
*/
-#ifdef WITH_OPENSSL
void
ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number)
{
+#ifdef WITH_SSH1
struct session_state *state = ssh->state;
const struct sshcipher *cipher = cipher_by_number(number);
int r;
@@ -816,8 +816,8 @@
error("Warning: %s", wmsg);
state->cipher_warning_done = 1;
}
+#endif /* WITH_SSH1 */
}
-#endif
/*
* Finalizes and sends the packet. If the encryption key has been set,
@@ -2727,23 +2727,29 @@
return sshbuf_put_stringb(ssh->state->outgoing_packet, v);
}
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
int
sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g)
{
return sshbuf_put_ec(ssh->state->outgoing_packet, v, g);
}
+#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
+#ifdef WITH_SSH1
int
sshpkt_put_bignum1(struct ssh *ssh, const BIGNUM *v)
{
return sshbuf_put_bignum1(ssh->state->outgoing_packet, v);
}
+#endif /* WITH_SSH1 */
+#ifdef WITH_OPENSSL
int
sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v)
{
return sshbuf_put_bignum2(ssh->state->outgoing_packet, v);
}
+#endif /* WITH_OPENSSL */
/* fetch data from the incoming packet */
@@ -2789,23 +2795,29 @@
return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp);
}
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
int
sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g)
{
return sshbuf_get_ec(ssh->state->incoming_packet, v, g);
}
+#endif /* WITH_OPENSSL && OPENSSL_HAS_ECC */
+#ifdef WITH_SSH1
int
sshpkt_get_bignum1(struct ssh *ssh, BIGNUM *v)
{
return sshbuf_get_bignum1(ssh->state->incoming_packet, v);
}
+#endif /* WITH_SSH1 */
+#ifdef WITH_OPENSSL
int
sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v)
{
return sshbuf_get_bignum2(ssh->state->incoming_packet, v);
}
+#endif /* WITH_OPENSSL */
int
sshpkt_get_end(struct ssh *ssh)