Issue #249: By requiring linking with OpenSSL, we now no longer need the #ifdef PR_USE_OPENSSL support throughout the code base. And this also makes for a clearer build failure when OpenSSL support is lacking.

Author: Castaglia

include/proxy/ssh/agent.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH agent API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,6 @@
 
 #include "mod_proxy.h"
 
-#if defined(PR_USE_OPENSSL)
-
 struct agent_key {
  unsigned char *key_data;
  uint32_t key_datalen;
@@ -43,6 +41,4 @@ const unsigned char *proxy_ssh_agent_sign_data(pool *, const char *,
 #define PROXY_SSH_AGENT_SIGN_FL_USE_RSA_SHA2560x001
 #define PROXY_SSH_AGENT_SIGN_FL_USE_RSA_SHA5120x002
 
-#endif /* PR_USE_OPENSSL */
-
 #endif /* MOD_PROXY_SSH_AGENT_H */

include/proxy/ssh/auth.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH auth API
- * Copyright (c) 2021-2022 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
 #include "proxy/session.h"
 #include "proxy/ssh/packet.h"
 
-#if defined(PR_USE_OPENSSL)
 int proxy_ssh_auth_init(pool *p);
 int proxy_ssh_auth_sess_init(pool *p, const struct proxy_session *proxy_sess);
 
@@ -41,6 +40,5 @@ int proxy_ssh_auth_handle(struct proxy_ssh_packet *pkt,
 
 int proxy_ssh_auth_set_frontend_success_handle(pool *p, int (*cb)(pool *p,
  const char *user));
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_AUTH_H */

include/proxy/ssh/bcrypt.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH bcrypt PBKDF2
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,12 +27,10 @@
 
 #include "mod_proxy.h"
 
-#if defined(PR_USE_OPENSSL)
 #define PROXY_SSH_BCRYPT_DIGEST_LEN32
 
 int proxy_ssh_bcrypt_pbkdf2(pool *p, const char *passphrase,
  size_t passphrase_len, unsigned char *salt, uint32_t salt_len,
  uint32_t rounds, unsigned char *key, uint32_t key_len);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_BCRYPT_H */

include/proxy/ssh/cipher.h

@@ -27,7 +27,6 @@
 
 #include "mod_proxy.h"
 
-#if defined(PR_USE_OPENSSL)
 #include <openssl/evp.h>
 
 int proxy_ssh_cipher_init(void);
@@ -69,6 +68,5 @@ int proxy_ssh_cipher_set_write_key(pool *p, const EVP_MD *md,
  int role);
 int proxy_ssh_cipher_write_data(struct proxy_ssh_packet *pkt,
  unsigned char *buf, size_t *bufsz);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_CIPHER_H */

include/proxy/ssh/compress.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH compression API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +28,6 @@
 #include "mod_proxy.h"
 #include "proxy/ssh/packet.h"
 
-#if defined(PR_USE_OPENSSL)
-
 #define PROXY_SSH_COMPRESS_FL_NEW_KEY1
 #define PROXY_SSH_COMPRESS_FL_AUTHENTICATED2
 
@@ -42,6 +40,5 @@ int proxy_ssh_compress_init_write(int);
 const char *proxy_ssh_compress_get_write_algo(void);
 int proxy_ssh_compress_set_write_algo(pool *p, const char *algo);
 int proxy_ssh_compress_write_data(struct proxy_ssh_packet *);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_COMPRESS_H */

include/proxy/ssh/crypto.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH crypto API
- * Copyright (c) 2021-2022 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 
 #include "mod_proxy.h"
 
-#if defined(PR_USE_OPENSSL)
 #include <openssl/evp.h>
 
 void proxy_ssh_crypto_free(int flags);
@@ -39,6 +38,5 @@ const char *proxy_ssh_crypto_get_kexinit_digest_list(pool *p);
 
 const char *proxy_ssh_crypto_get_errors(void);
 size_t proxy_ssh_crypto_get_size(size_t, size_t);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_CRYPTO_H */

include/proxy/ssh/db.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH Database API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,9 +28,7 @@
 #include "mod_proxy.h"
 #include "proxy/ssh.h"
 
-#if defined(PR_USE_OPENSSL)
 int proxy_ssh_db_as_datastore(struct proxy_ssh_datastore *ds, void *ds_data,
  size_t ds_datasz);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_DB_H */

include/proxy/ssh/disconnect.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH disconnect API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,6 @@
 
 #include "mod_proxy.h"
 
-#if defined(PR_USE_OPENSSL)
-
 void proxy_ssh_disconnect_conn(conn_t *, uint32_t, const char *, const char *,
  int, const char *);
 void proxy_ssh_disconnect_send(pool *, conn_t *, uint32_t, const char *,
@@ -43,19 +41,18 @@ const char *proxy_ssh_disconnect_get_text(uint32_t);
  * (e.g. SunStudio) like __func__.
  */
 
-# if defined(__FUNCTION__)
+#if defined(__FUNCTION__)
 #define PROXY_SSH_DISCONNECT_CONN(c, n, m) \
  proxy_ssh_disconnect_conn((c), (n), (m), __FILE__, __LINE__, __FUNCTION__)
 
-# elif defined(__func__)
+#elif defined(__func__)
 #define PROXY_SSH_DISCONNECT_CONN(c, n, m) \
  proxy_ssh_disconnect_conn((c), (n), (m), __FILE__, __LINE__, __func__)
 
-# else
+#else
 #define PROXY_SSH_DISCONNECT_CONN(c, n, m) \
  proxy_ssh_disconnect_conn((c), (n), (m), __FILE__, __LINE__, "")
 
-# endif
-#endif /* PR_USE_OPENSSL */
+#endif
 
 #endif /* MOD_PROXY_SSH_DISCONNECT_H */

include/proxy/ssh/interop.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH interop API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,8 +28,6 @@
 #include "mod_proxy.h"
 #include "proxy/session.h"
 
-#if defined(PR_USE_OPENSSL)
-
 /* For servers which do not support IGNORE packets */
 #define PROXY_SSH_FEAT_IGNORE_MSG0x0001
 
@@ -98,6 +96,5 @@ int proxy_ssh_interop_supports_feature(int);
 
 int proxy_ssh_interop_init(void);
 int proxy_ssh_interop_free(void);
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_INTEROP_H */

include/proxy/ssh/kex.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy SSH kex API
- * Copyright (c) 2021 TJ Saunders
+ * Copyright (c) 2021-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@
 #include "proxy/session.h"
 #include "proxy/ssh.h"
 
-#if defined(PR_USE_OPENSSL)
-
 int proxy_ssh_kex_handle(struct proxy_ssh_packet *pkt,
  const struct proxy_session *proxy_sess);
 int proxy_ssh_kex_init(pool *p, const char *client_version,
@@ -46,6 +44,5 @@ int proxy_ssh_kex_send_first_kexinit(pool *p,
 
 #define PROXY_SSH_KEX_DH_GROUP_MIN1024
 #define PROXY_SSH_KEX_DH_GROUP_MAX8192
-#endif /* PR_USE_OPENSSL */
 
 #endif /* MOD_PROXY_SSH_KEX_H */