Unverified Commit 1e853653 authored by Chris Young's avatar Chris Young Committed by Daniel Stenberg
Browse files

configure: add --with-amissl 

AmiSSL is an Amiga native library which provides a wrapper over OpenSSL.
It also requires all programs using it to use bsdsocket.library
directly, rather than accessing socket functions through clib, which
libcurl was not necessarily doing previously. Configure will now check
for the headers and ensure they are included if found.

Closes #3677
parent 76a9d8df

acinclude.m4

+39 −1
Original line number Diff line number Diff line
@@ -1031,6 +1031,10 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ 
#endif

#endif

#else

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif
@@ -1076,6 +1080,10 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ 
#endif

#define RECVCALLCONV PASCAL

#else

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif
@@ -1084,8 +1092,10 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ 
#endif

#define RECVCALLCONV

#endif

#ifndef HAVE_PROTO_BSDSOCKET_H

                      extern $recv_retv RECVCALLCONV

                      recv($recv_arg1, $recv_arg2, $recv_arg3, $recv_arg4);

#endif

                    ]],[[

                      $recv_arg1 s=0;

                      $recv_arg2 buf=0;
@@ -1165,6 +1175,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ 
#endif

#endif

#else

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif
@@ -1210,6 +1224,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ 
#endif

#define SENDCALLCONV PASCAL

#else

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif
@@ -1218,8 +1236,10 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ 
#endif

#define SENDCALLCONV

#endif

#ifndef HAVE_PROTO_BSDSOCKET_H

                      extern $send_retv SENDCALLCONV

                      send($send_arg1, $send_arg2, $send_arg3, $send_arg4);

#endif

                    ]],[[

                      $send_arg1 s=0;

                      $send_arg3 len=0;
@@ -1321,6 +1341,10 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ 
#endif

#endif

#else

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#endif

#ifdef HAVE_SYS_TYPES_H

#include <sys/types.h>

#endif
@@ -1714,6 +1738,7 @@ dnl using current libraries or if another one is required. 


AC_DEFUN([CURL_CHECK_LIBS_CONNECT], [

  AC_REQUIRE([CURL_INCLUDES_WINSOCK2])dnl

  AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl

  AC_MSG_CHECKING([for connect in libraries])

  tst_connect_save_LIBS="$LIBS"

  tst_connect_need_LIBS="unknown"
@@ -1723,7 +1748,8 @@ AC_DEFUN([CURL_CHECK_LIBS_CONNECT], [ 
      AC_LINK_IFELSE([

        AC_LANG_PROGRAM([[

          $curl_includes_winsock2

          #ifndef HAVE_WINDOWS_H

          $curl_includes_bsdsocket

          #if !defined(HAVE_WINDOWS_H) && !defined(HAVE_PROTO_BSDSOCKET_H)

            int connect(int, void*, int);

          #endif

        ]],[[
@@ -1854,6 +1880,11 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ 
#endif

#endif

#ifndef HAVE_WINDOWS_H

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)

#endif

#ifdef HAVE_SYS_SELECT_H

#include <sys/select.h>

#endif
@@ -1912,6 +1943,11 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ 
#endif

#endif

#ifndef HAVE_WINDOWS_H

#ifdef HAVE_PROTO_BSDSOCKET_H

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)

#endif

#ifdef HAVE_SYS_SELECT_H

#include <sys/select.h>

#endif
@@ -1926,12 +1962,14 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ 
                      long tv_usec;

                    };

#endif

#ifndef HAVE_PROTO_BSDSOCKET_H

                    extern $sel_retv SELECTCALLCONV

				select($sel_arg1,

					$sel_arg234,

					$sel_arg234,

					$sel_arg234,

					$sel_arg5);

#endif

                  ]],[[

                    $sel_arg1   nfds=0;

                    $sel_arg234 rfds=0;

configure.ac

+56 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ AC_SUBST(PKGADD_VENDOR) 


dnl

dnl initialize all the info variables

    curl_ssl_msg="no      (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,schannel,secure-transport,mesalink} )"

    curl_ssl_msg="no      (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,schannel,secure-transport,mesalink,amissl} )"

    curl_ssh_msg="no      (--with-libssh2)"

   curl_zlib_msg="no      (--with-zlib)"

 curl_brotli_msg="no      (--with-brotli)"
@@ -365,6 +365,7 @@ CURL_CHECK_WIN32_LARGEFILE 
CURL_MAC_CFLAGS

CURL_SUPPORTS_BUILTIN_AVAILABLE





dnl ************************************************************

dnl switch off particular protocols

dnl
@@ -837,6 +838,28 @@ then 
  ])

fi



if test "$HAVE_GETHOSTBYNAME" != "1"

then

  dnl This is for AmigaOS with bsdsocket.library - needs testing before -lnet

  AC_MSG_CHECKING([for gethostbyname for AmigaOS bsdsocket.library])

  AC_LINK_IFELSE([

    AC_LANG_PROGRAM([[

#include <proto/bsdsocket.h>

struct Library *SocketBase = NULL;

    ]],[[

      gethostbyname("www.dummysite.com");

    ]])

  ],[

    AC_MSG_RESULT([yes])

    HAVE_GETHOSTBYNAME="1"

    HAVE_PROTO_BSDSOCKET_H="1"

    AC_DEFINE(HAVE_PROTO_BSDSOCKET_H, 1, [if Amiga bsdsocket.library is in use])

    AC_SUBST(HAVE_PROTO_BSDSOCKET_H, [1])

  ],[

    AC_MSG_RESULT([no])

  ])

fi



if test "$HAVE_GETHOSTBYNAME" != "1"

then

  dnl gethostbyname in the network lib - for Haiku OS
@@ -1539,6 +1562,35 @@ else 
  AC_MSG_RESULT(no)

fi



OPT_AMISSL=no

AC_ARG_WITH(amissl,dnl

AC_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)])

AC_HELP_STRING([--without-amissl], [disable Amiga native SSL/TLS (AmiSSL)]),

  OPT_AMISSL=$withval)



AC_MSG_CHECKING([whether to enable Amiga native SSL/TLS (AmiSSL)])

if test "$HAVE_PROTO_BSDSOCKET_H" == "1"; then

  if test -z "$ssl_backends" -o "x$OPT_AMISSL" != xno; then

    ssl_msg=

    if test "x$OPT_AMISSL" != "xno"; then

      AC_MSG_RESULT(yes)

      ssl_msg="AmiSSL"

      test amissl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes

      AMISSL_ENABLED=1

      LIBS="-lamisslauto $LIBS"

      AC_DEFINE(USE_AMISSL, 1, [if AmiSSL is in use])

      AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use])

    else

      AC_MSG_RESULT(no)

    fi

    test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"

  else

    AC_MSG_RESULT(no)

  fi

else

  AC_MSG_RESULT(no)

fi



dnl **********************************************************************

dnl Check for the presence of SSL libraries and headers

dnl **********************************************************************
@@ -2638,10 +2690,10 @@ if test -z "$ssl_backends" -o "x$OPT_NSS" != xno; then 
  test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"

fi



case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$MBEDTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED" in

case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$POLARSSL_ENABLED$MBEDTLS_ENABLED$CYASSL_ENABLED$WINSSL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$AMISSL_ENABLED" in

x)

  AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.])

  AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-schannel, --with-secure-transport, or --with-mesalink to address this.])

  AC_MSG_WARN([Use --with-ssl, --with-gnutls, --with-polarssl, --with-cyassl, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink or --with-amissl to address this.])

  ;;

x1)

  # one SSL backend is enabled
@@ -3522,6 +3574,7 @@ dnl default includes 
]

)





dnl Checks for typedefs, structures, and compiler characteristics.

AC_C_CONST

CURL_CHECK_VARIADIC_MACROS

lib/amigaos.c

+25 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -22,17 +22,26 @@ 


#include "curl_setup.h"



#if defined(__AMIGA__) && !defined(__ixemul__)



#ifdef __AMIGA__

#  include "amigaos.h"

#  if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)

#    include <amitcp/socketbasetags.h>

#  endif

#  ifdef __libnix__

#    include <stabs.h>

#  endif

#endif



#include "amigaos.h"

/* The last #include files should be: */

#include "curl_memory.h"

#include "memdebug.h"



#ifdef __AMIGA__

#if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)

struct Library *SocketBase = NULL;

extern int errno, h_errno;



#ifdef __libnix__

#include <stabs.h>

void __request(const char *msg);

#else

# define __request(msg)       Printf(msg "\n\a")
@@ -74,4 +83,13 @@ bool Curl_amiga_init() 
ADD2EXIT(Curl_amiga_cleanup, -50);

#endif



#endif /* __AMIGA__ && ! __ixemul__ */
 
#endif /* HAVE_PROTO_BSDSOCKET_H */



#ifdef USE_AMISSL

void Curl_amiga_X509_free(X509 *a)

{

  X509_free(a);

}

#endif /* USE_AMISSL */

#endif /* __AMIGA__ */

lib/amigaos.h

+8 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@ 
 ***************************************************************************/

#include "curl_setup.h"



#if defined(__AMIGA__) && !defined(__ixemul__)

#if defined(__AMIGA__) && defined(HAVE_BSDSOCKET_H) && !defined(USE_AMISSL)



bool Curl_amiga_init();

void Curl_amiga_cleanup();
@@ -35,4 +35,10 @@ void Curl_amiga_cleanup(); 


#endif



#ifdef USE_AMISSL

#include <openssl/x509v3.h>

void Curl_amiga_X509_free(X509 *a);

#endif /* USE_AMISSL */



#endif /* HEADER_CURL_AMIGAOS_H */

lib/curl_setup.h

+6 −5
Original line number Diff line number Diff line
@@ -310,11 +310,12 @@ 
#endif



#ifdef __AMIGA__

#  ifndef __ixemul__

#  include <exec/types.h>

#  include <exec/execbase.h>

#  include <proto/exec.h>

#  include <proto/dos.h>

#  ifdef HAVE_PROTO_BSDSOCKET_H

#    include <proto/bsdsocket.h> /* ensure bsdsocket.library use */

#    define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)

#  endif

#endif