wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for libssh2.

Browse Source
This commit is contained in:
Hayden Roche
2021-07-30 13:37:31 -07:00
parent 50ae93071d
commit 279b0facb5
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -773,6 +773,7 @@ AC_ARG_ENABLE([mcast],
# List of open source project defines using our openssl compatibility layer: # List of open source project defines using our openssl compatibility layer:
# bind dns (--enable-bind) WOLFSSL_BIND # bind dns (--enable-bind) WOLFSSL_BIND
# libssh2 (--enable-libssh2)
# openssh (--enable-openssh) WOLFSSL_OPENSSH # openssh (--enable-openssh) WOLFSSL_OPENSSH
# openvpn (--enable-openvpn) WOLFSSL_OPENVPN # openvpn (--enable-openvpn) WOLFSSL_OPENVPN
# nginix (--enable-nginx) WOLFSSL_NGINX # nginix (--enable-nginx) WOLFSSL_NGINX
@ -799,6 +800,11 @@ AC_ARG_ENABLE([bind],
[ENABLED_BIND=$enableval], [ENABLED_BIND=$enableval],
[ENABLED_BIND=no]) [ENABLED_BIND=no])
AC_ARG_ENABLE([libssh2],
[AS_HELP_STRING([--enable-libssh2],[Enable libssh2 compatibility build (default: disabled)])],
[ENABLED_LIBSSH2=$enableval],
[ENABLED_LIBSSH2=no])
# OpenSSH compatibility Build # OpenSSH compatibility Build
AC_ARG_ENABLE([openssh], AC_ARG_ENABLE([openssh],
[AS_HELP_STRING([--enable-openssh],[Enable OpenSSH compatibility build (default: disabled)])], [AS_HELP_STRING([--enable-openssh],[Enable OpenSSH compatibility build (default: disabled)])],
@ -959,7 +965,7 @@ AC_ARG_ENABLE([opensslextra],
[ ENABLED_OPENSSLEXTRA=$enableval ], [ ENABLED_OPENSSLEXTRA=$enableval ],
[ ENABLED_OPENSSLEXTRA=no ] [ ENABLED_OPENSSLEXTRA=no ]
) )
if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_NGINX" = "yes" || test "$ENABLED_SIGNAL" = "yes" || test "$ENABLED_WPAS" = "yes" || test "$ENABLED_FORTRESS" = "yes" || test "$ENABLED_BUMP" = "yes" || test "$ENABLED_SNIFFER" = "yes" || test "$ENABLED_OPENSSLALL" = "yes" || test "$ENABLED_LIBWEBSOCKETS" = "yes" || test "x$ENABLED_LIGHTY" = "xyes" if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_NGINX" = "yes" || test "$ENABLED_SIGNAL" = "yes" || test "$ENABLED_WPAS" = "yes" || test "$ENABLED_FORTRESS" = "yes" || test "$ENABLED_BUMP" = "yes" || test "$ENABLED_SNIFFER" = "yes" || test "$ENABLED_OPENSSLALL" = "yes" || test "$ENABLED_LIBWEBSOCKETS" = "yes" || test "x$ENABLED_LIGHTY" = "xyes" || test "$ENABLED_LIBSSH2" = "yes"
then then
ENABLED_OPENSSLEXTRA="yes" ENABLED_OPENSSLEXTRA="yes"
fi fi
@ -1364,7 +1370,7 @@ AC_ARG_ENABLE([aesctr],
[ ENABLED_AESCTR=$enableval ], [ ENABLED_AESCTR=$enableval ],
[ ENABLED_AESCTR=no ] [ ENABLED_AESCTR=no ]
) )
if test "$ENABLED_OPENVPN" = "yes" if test "$ENABLED_OPENVPN" = "yes" || test "$ENABLED_LIBSSH2" = "yes"
then then
ENABLED_AESCTR=yes ENABLED_AESCTR=yes
fi fi
@ -1888,7 +1894,7 @@ AC_ARG_ENABLE([keygen],
[ ENABLED_KEYGEN=no ] [ ENABLED_KEYGEN=no ]
) )
if test "$ENABLED_BIND" = "yes" if test "$ENABLED_BIND" = "yes" || test "$ENABLED_LIBSSH2" = "yes"
then then
ENABLED_KEYGEN=yes ENABLED_KEYGEN=yes
fi fi
@ -2008,7 +2014,7 @@ AC_ARG_ENABLE([dsa],
[ ENABLED_DSA=no ] [ ENABLED_DSA=no ]
) )
if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_OPENVPN" = "yes" || test "$ENABLED_NGINX" = "yes" || test "$ENABLED_WPAS" = "yes" || test "$ENABLED_QT" = "yes" || test "$ENABLED_BIND" = "yes" if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_OPENVPN" = "yes" || test "$ENABLED_NGINX" = "yes" || test "$ENABLED_WPAS" = "yes" || test "$ENABLED_QT" = "yes" || test "$ENABLED_BIND" = "yes" || test "$ENABLED_LIBSSH2" = "yes"
then then
ENABLED_DSA="yes" ENABLED_DSA="yes"
fi fi
@ -3003,7 +3009,7 @@ AC_ARG_ENABLE([des3],
[ ENABLED_DES3=no ] [ ENABLED_DES3=no ]
) )
if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_QT" = "yes" || test "$ENABLED_OPENVPN" = "yes" || test "x$ENABLED_WPAS" != "xno" if test "$ENABLED_OPENSSH" = "yes" || test "$ENABLED_QT" = "yes" || test "$ENABLED_OPENVPN" = "yes" || test "x$ENABLED_WPAS" != "xno" || test "$ENABLED_LIBSSH2" = "yes"
then then
ENABLED_DES3="yes" ENABLED_DES3="yes"
fi fi
@ -6923,6 +6929,7 @@ echo " * LIGHTY: $ENABLED_LIGHTY"
echo " * HAPROXY: $ENABLED_HAPROXY" echo " * HAPROXY: $ENABLED_HAPROXY"
echo " * STUNNEL: $ENABLED_STUNNEL" echo " * STUNNEL: $ENABLED_STUNNEL"
echo " * tcpdump: $ENABLED_TCPDUMP" echo " * tcpdump: $ENABLED_TCPDUMP"
echo " * libssh2: $ENABLED_LIBSSH2"
echo " * Apache httpd: $ENABLED_APACHE_HTTPD" echo " * Apache httpd: $ENABLED_APACHE_HTTPD"
echo " * NGINX: $ENABLED_NGINX" echo " * NGINX: $ENABLED_NGINX"
echo " * ASIO: $ENABLED_ASIO" echo " * ASIO: $ENABLED_ASIO"

11
src/ssl.c
View File

@ -35133,7 +35133,6 @@ int wolfSSL_ECPoint_i2d(const WOLFSSL_EC_GROUP *group,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2))
/* return code compliant with OpenSSL : /* return code compliant with OpenSSL :
* 1 if success, 0 if error * 1 if success, 0 if error
*/ */
@ -35147,7 +35146,8 @@ int wolfSSL_ECPoint_d2i(unsigned char *in, unsigned int len,
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#ifndef HAVE_SELFTEST #if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION>2)))
if (wc_ecc_import_point_der_ex(in, len, group->curve_idx, if (wc_ecc_import_point_der_ex(in, len, group->curve_idx,
(ecc_point*)p->internal, 0) != MP_OKAY) { (ecc_point*)p->internal, 0) != MP_OKAY) {
WOLFSSL_MSG("wc_ecc_import_point_der_ex failed"); WOLFSSL_MSG("wc_ecc_import_point_der_ex failed");
@ -35185,7 +35185,8 @@ size_t wolfSSL_EC_POINT_point2oct(const WOLFSSL_EC_GROUP *group,
byte *buf, size_t len, WOLFSSL_BN_CTX *ctx) byte *buf, size_t len, WOLFSSL_BN_CTX *ctx)
{ {
word32 min_len = (word32)len; word32 min_len = (word32)len;
#ifndef HAVE_SELFTEST #if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
int compressed = form == POINT_CONVERSION_COMPRESSED ? 1 : 0; int compressed = form == POINT_CONVERSION_COMPRESSED ? 1 : 0;
#endif /* !HAVE_SELFTEST */ #endif /* !HAVE_SELFTEST */
@ -35220,7 +35221,8 @@ size_t wolfSSL_EC_POINT_point2oct(const WOLFSSL_EC_GROUP *group,
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#ifndef HAVE_SELFTEST #if !defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
if (wc_ecc_export_point_der_ex(group->curve_idx, (ecc_point*)p->internal, if (wc_ecc_export_point_der_ex(group->curve_idx, (ecc_point*)p->internal,
buf, &min_len, compressed) != (buf ? MP_OKAY : LENGTH_ONLY_E)) { buf, &min_len, compressed) != (buf ? MP_OKAY : LENGTH_ONLY_E)) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
@ -35467,7 +35469,6 @@ WOLFSSL_BIGNUM *wolfSSL_EC_POINT_point2bn(const WOLFSSL_EC_GROUP *group,
return ret; return ret;
} }
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#ifdef USE_ECC_B_PARAM #ifdef USE_ECC_B_PARAM
int wolfSSL_EC_POINT_is_on_curve(const WOLFSSL_EC_GROUP *group, int wolfSSL_EC_POINT_is_on_curve(const WOLFSSL_EC_GROUP *group,