svn commit: r338770 - projects/openssl111/contrib/dma

[Jung-uk Kim]

Author: jkim
Date: Wed Sep 19 06:42:05 2018
New Revision: 338770
URL: https://svnweb.freebsd.org/changeset/base/338770

Log:
  Make dma(8) buildable.

Modified:
  projects/openssl111/contrib/dma/crypto.c
  projects/openssl111/contrib/dma/dma-mbox-create.c
  projects/openssl111/contrib/dma/local.c
  projects/openssl111/contrib/dma/mail.c
  projects/openssl111/contrib/dma/net.c
  projects/openssl111/contrib/dma/spool.c
  projects/openssl111/contrib/dma/util.c

Modified: projects/openssl111/contrib/dma/crypto.c
==============================================================================
--- projects/openssl111/contrib/dma/crypto.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/crypto.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -40,6 +40,7 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 
+#include <string.h>
 #include <syslog.h>
 
 #include "dma.h"
@@ -93,7 +94,12 @@ smtp_init_crypto(int fd, int feature)
 	SSL_library_init();
 	SSL_load_error_strings();
 
-	meth = TLSv1_client_method();
+	// Allow any possible version
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+	meth = TLS_client_method();
+#else
+	meth = SSLv23_client_method();
+#endif
 
 	ctx = SSL_CTX_new(meth);
 	if (ctx == NULL) {

Modified: projects/openssl111/contrib/dma/dma-mbox-create.c
==============================================================================
--- projects/openssl111/contrib/dma/dma-mbox-create.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/dma-mbox-create.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -56,6 +56,7 @@
 #include <paths.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 

Modified: projects/openssl111/contrib/dma/local.c
==============================================================================
--- projects/openssl111/contrib/dma/local.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/local.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -44,6 +44,7 @@
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 

Modified: projects/openssl111/contrib/dma/mail.c
==============================================================================
--- projects/openssl111/contrib/dma/mail.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/mail.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -36,6 +36,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <signal.h>
+#include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 

Modified: projects/openssl111/contrib/dma/net.c
==============================================================================
--- projects/openssl111/contrib/dma/net.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/net.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -53,6 +53,7 @@
 #include <netdb.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 

Modified: projects/openssl111/contrib/dma/spool.c
==============================================================================
--- projects/openssl111/contrib/dma/spool.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/spool.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -45,6 +45,7 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <unistd.h>
+#include <string.h>
 #include <syslog.h>
 
 #include "dma.h"

Modified: projects/openssl111/contrib/dma/util.c
==============================================================================
--- projects/openssl111/contrib/dma/util.c	Wed Sep 19 06:39:10 2018	(r338769)
+++ projects/openssl111/contrib/dma/util.c	Wed Sep 19 06:42:05 2018	(r338770)
@@ -44,6 +44,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
 #include <unistd.h>