diff options
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index a8fb07b52..4c57d4df3 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.79 2014/02/02 03:44:31 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.80 2014/04/29 18:01:49 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -38,14 +38,18 @@ | |||
38 | #include <string.h> | 38 | #include <string.h> |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | 40 | ||
41 | #ifdef WITH_OPENSSL | ||
41 | #include <openssl/bn.h> | 42 | #include <openssl/bn.h> |
42 | #include <openssl/dh.h> | 43 | #include <openssl/dh.h> |
43 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #endif | ||
44 | 46 | ||
45 | #include "openbsd-compat/sys-queue.h" | 47 | #include "openbsd-compat/sys-queue.h" |
46 | #include "xmalloc.h" | 48 | #include "xmalloc.h" |
47 | #include "ssh.h" | 49 | #include "ssh.h" |
50 | #ifdef WITH_OPENSSL | ||
48 | #include "dh.h" | 51 | #include "dh.h" |
52 | #endif | ||
49 | #include "buffer.h" | 53 | #include "buffer.h" |
50 | #include "key.h" | 54 | #include "key.h" |
51 | #include "cipher.h" | 55 | #include "cipher.h" |
@@ -174,6 +178,7 @@ mm_request_receive_expect(int sock, enum monitor_reqtype type, Buffer *m) | |||
174 | rtype, type); | 178 | rtype, type); |
175 | } | 179 | } |
176 | 180 | ||
181 | #ifdef WITH_OPENSSL | ||
177 | DH * | 182 | DH * |
178 | mm_choose_dh(int min, int nbits, int max) | 183 | mm_choose_dh(int min, int nbits, int max) |
179 | { | 184 | { |
@@ -207,6 +212,7 @@ mm_choose_dh(int min, int nbits, int max) | |||
207 | 212 | ||
208 | return (dh_new_group(g, p)); | 213 | return (dh_new_group(g, p)); |
209 | } | 214 | } |
215 | #endif | ||
210 | 216 | ||
211 | int | 217 | int |
212 | mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | 218 | mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) |
@@ -930,6 +936,7 @@ mm_terminate(void) | |||
930 | buffer_free(&m); | 936 | buffer_free(&m); |
931 | } | 937 | } |
932 | 938 | ||
939 | #ifdef WITH_SSH1 | ||
933 | int | 940 | int |
934 | mm_ssh1_session_key(BIGNUM *num) | 941 | mm_ssh1_session_key(BIGNUM *num) |
935 | { | 942 | { |
@@ -949,6 +956,7 @@ mm_ssh1_session_key(BIGNUM *num) | |||
949 | 956 | ||
950 | return (rsafail); | 957 | return (rsafail); |
951 | } | 958 | } |
959 | #endif | ||
952 | 960 | ||
953 | static void | 961 | static void |
954 | mm_chall_setup(char **name, char **infotxt, u_int *numprompts, | 962 | mm_chall_setup(char **name, char **infotxt, u_int *numprompts, |
@@ -1096,6 +1104,7 @@ mm_ssh1_session_id(u_char session_id[16]) | |||
1096 | buffer_free(&m); | 1104 | buffer_free(&m); |
1097 | } | 1105 | } |
1098 | 1106 | ||
1107 | #ifdef WITH_SSH1 | ||
1099 | int | 1108 | int |
1100 | mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | 1109 | mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) |
1101 | { | 1110 | { |
@@ -1191,6 +1200,7 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16]) | |||
1191 | 1200 | ||
1192 | return (success); | 1201 | return (success); |
1193 | } | 1202 | } |
1203 | #endif | ||
1194 | 1204 | ||
1195 | #ifdef SSH_AUDIT_EVENTS | 1205 | #ifdef SSH_AUDIT_EVENTS |
1196 | void | 1206 | void |