diff options
| author | Damien Miller <djm@mindrot.org> | 2015-01-30 13:10:17 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-02-18 12:29:32 +0100 |
| commit | 773dda25e828c4c9a52f7bdce6e1e5924157beab (patch) | |
| tree | 831507f35a8feb0ae984a7a13f521932a0fedb61 /packet.c | |
| parent | hook up hostkeys unittest to portable Makefiles (diff) | |
| download | openssh-773dda25e828c4c9a52f7bdce6e1e5924157beab.tar.xz openssh-773dda25e828c4c9a52f7bdce6e1e5924157beab.zip | |
repair --without-openssl; broken in refactor
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -788,10 +788,10 @@ ssh_packet_set_compress_hooks(struct ssh *ssh, void *ctx, * 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 @@ ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, 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 @@ sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v) 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 @@ sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp) 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) |