Fix building on Debian 10

Moved last openssl header into openssl_sml.c to avoid including any
unparseable system headers (ossl_typ.h pulled in inttypes.h which
fails to parse).

diff --git a/openssl/openssl_sml.c b/openssl/openssl_sml.c
index d934217..c2028e3 100644 (file)
--- a/openssl/openssl_sml.c
+++ b/openssl/openssl_sml.c
@@ -1,3 +1,4 @@
+#include <openssl/ossl_typ.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/asn1.h>

diff --git a/openssl/openssl_sml.h b/openssl/openssl_sml.h
index 3f33922..f632ffd 100644 (file)
--- a/openssl/openssl_sml.h
+++ b/openssl/openssl_sml.h
@@ -1,8 +1,9 @@
-#include <openssl/ossl_typ.h>
-
-/* SSL_METHOD is defined in <openssl/ssl.h>, which #includes system
-   headers that ml-nlffigen can't parse. */
-
+/* OpenSSL header files include system headers that ml-nlffigen can't
+   parse, include any needed typedefs or forward declarations here.
+ */
+typedef struct bio_st BIO;
+typedef struct ssl_st SSL;
+typedef struct ssl_ctx_st SSL_CTX;
 typedef struct ssl_method_st SSL_METHOD;
 
 void OpenSSL_SML_init(void);