diff options
| author |   djm <djm@openbsd.org> | 2019-09-06 05:23:55 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-06 05:23:55 +0000 |
| commit | 1f96526fb0deff53898d266d4e2e399e64e301ef (patch) | |
| tree | 97f4b05f2b48e51c0d3734edbd9464b42cb9ed34 /usr.bin/ssh/ssh_api.c | |
| parent | lots of things were relying on libcrypto headers to transitively (diff) | |
| download | wireguard-openbsd-1f96526fb0deff53898d266d4e2e399e64e301ef.tar.xz wireguard-openbsd-1f96526fb0deff53898d266d4e2e399e64e301ef.zip | |
fixes for !WITH_OPENSSL compilation; ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh_api.c')
| -rw-r--r-- | usr.bin/ssh/ssh_api.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh_api.c b/usr.bin/ssh/ssh_api.c index 4e250b38d0c..43aebbc3121 100644 --- a/usr.bin/ssh/ssh_api.c +++ b/usr.bin/ssh/ssh_api.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh_api.c,v 1.16 2019/09/06 04:53:27 djm Exp $ */ +/* $OpenBSD: ssh_api.c,v 1.17 2019/09/06 05:23:55 djm Exp $ */ /* * Copyright (c) 2012 Markus Friedl. All rights reserved. * @@ -51,7 +51,10 @@ int _ssh_host_key_sign(struct ssh *, struct sshkey *, struct sshkey *, int use_privsep = 0; int mm_sshkey_sign(struct sshkey *, u_char **, u_int *, u_char *, u_int, char *, u_int); + +#ifdef WITH_OPENSSL DH *mm_choose_dh(int, int, int); +#endif /* Define these two variables here so that they are part of the library */ u_char *session_id2 = NULL; @@ -64,11 +67,13 @@ mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int *lenp, return (-1); } +#ifdef WITH_OPENSSL DH * mm_choose_dh(int min, int nbits, int max) { return (NULL); } +#endif /* API */ @@ -82,7 +87,9 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) int r; if (!called) { +#ifdef WITH_OPENSSL OpenSSL_add_all_algorithms(); +#endif called = 1; } |