summaryrefslogtreecommitdiff
path: root/ssh_api.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-09-06 05:23:55 +0000
committerDamien Miller <djm@mindrot.org>2019-09-06 17:54:21 +1000
commit670104b923dd97b1c06c0659aef7c3e52af571b2 (patch)
tree28f189b92f2b56d071535b13e969050c7465fc58 /ssh_api.c
parentbe02d7cbde3d211ec2ed2320a1f7d86b2339d758 (diff)
upstream: fixes for !WITH_OPENSSL compilation; ok dtucker@
OpenBSD-Commit-ID: 7fd68eaa9e0f7482b5d4c7e8d740aed4770a839f
Diffstat (limited to 'ssh_api.c')
-rw-r--r--ssh_api.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh_api.c b/ssh_api.c
index 255adc6cf..6ea40b5e7 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh_api.c,v 1.16 2019/09/06 04:53:27 djm Exp $ */ 1/* $OpenBSD: ssh_api.c,v 1.17 2019/09/06 05:23:55 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2012 Markus Friedl. All rights reserved. 3 * Copyright (c) 2012 Markus Friedl. All rights reserved.
4 * 4 *
@@ -55,7 +55,10 @@ int _ssh_host_key_sign(struct ssh *, struct sshkey *, struct sshkey *,
55int use_privsep = 0; 55int use_privsep = 0;
56int mm_sshkey_sign(struct sshkey *, u_char **, u_int *, 56int mm_sshkey_sign(struct sshkey *, u_char **, u_int *,
57 u_char *, u_int, char *, u_int); 57 u_char *, u_int, char *, u_int);
58
59#ifdef WITH_OPENSSL
58DH *mm_choose_dh(int, int, int); 60DH *mm_choose_dh(int, int, int);
61#endif
59 62
60/* Define these two variables here so that they are part of the library */ 63/* Define these two variables here so that they are part of the library */
61u_char *session_id2 = NULL; 64u_char *session_id2 = NULL;
@@ -68,11 +71,13 @@ mm_sshkey_sign(struct sshkey *key, u_char **sigp, u_int *lenp,
68 return (-1); 71 return (-1);
69} 72}
70 73
74#ifdef WITH_OPENSSL
71DH * 75DH *
72mm_choose_dh(int min, int nbits, int max) 76mm_choose_dh(int min, int nbits, int max)
73{ 77{
74 return (NULL); 78 return (NULL);
75} 79}
80#endif
76 81
77/* API */ 82/* API */
78 83