Drop code support
This commit is contained in:
Andras Fekete
parent
66f04f8db5
commit
2b2509c56c
@ -1963,7 +1963,6 @@ else()
|
||||
set(WOLFSSL_OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
endif()
|
||||
set(OPTION_FILE "${WOLFSSL_OUTPUT_BASE}/wolfssl/options.h")
|
||||
set(CYASSL_OPTION_FILE "${WOLFSSL_OUTPUT_BASE}/cyassl/options.h")
|
||||
|
||||
file(REMOVE ${OPTION_FILE})
|
||||
|
||||
@ -1993,14 +1992,6 @@ file(APPEND ${OPTION_FILE} "}\n")
|
||||
file(APPEND ${OPTION_FILE} "#endif\n\n\n")
|
||||
file(APPEND ${OPTION_FILE} "#endif /* WOLFSSL_OPTIONS_H */\n\n")
|
||||
|
||||
# backwards compatibility for those who have included options or version
|
||||
file(REMOVE ${CYASSL_OPTION_FILE})
|
||||
file(APPEND ${CYASSL_OPTION_FILE} "/* cyassl options.h\n")
|
||||
file(APPEND ${CYASSL_OPTION_FILE} " * generated from wolfssl/options.h\n")
|
||||
file(APPEND ${CYASSL_OPTION_FILE} " */\n")
|
||||
file(READ ${OPTION_FILE} OPTION_FILE_CONTENTS)
|
||||
file(APPEND ${CYASSL_OPTION_FILE} ${OPTION_FILE_CONTENTS})
|
||||
|
||||
####################################################
|
||||
# Library Target
|
||||
####################################################
|
||||
@ -2206,7 +2197,6 @@ include(GNUInstallDirs)
|
||||
|
||||
set(HEADER_EXCLUDE
|
||||
"internal.h"
|
||||
"cyassl/ctaocrypt/port"
|
||||
"wolfssl/wolfcrypt/port/nrf51.h"
|
||||
"wolfssl/wolfcrypt/port/arm"
|
||||
"wolfssl/wolfcrypt/port/cypress"
|
||||
@ -2351,19 +2341,10 @@ install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/wolfssl/
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfssl
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
|
||||
install(DIRECTORY ${WOLFSSL_OUTPUT_BASE}/cyassl/
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cyassl
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl/
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfssl
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
|
||||
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cyassl/
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cyassl
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
|
||||
|
||||
|
||||
# Install the examples
|
||||
install(FILES ${INSTALLED_EXAMPLES}
|
||||
|
||||
@ -161,7 +161,6 @@ EXTRA_DIST+= m4/ax_atomic.m4
|
||||
|
||||
include cmake/include.am
|
||||
include wrapper/include.am
|
||||
include cyassl/include.am
|
||||
include wolfssl/include.am
|
||||
include certs/include.am
|
||||
include doc/include.am
|
||||
@ -245,7 +244,6 @@ test: check
|
||||
tests/unit.log: testsuite/testsuite.log
|
||||
scripts/unit.log: testsuite/testsuite.log
|
||||
|
||||
DISTCLEANFILES+= cyassl-config
|
||||
DISTCLEANFILES+= wolfssl-config
|
||||
|
||||
MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/async.h
|
||||
@ -267,7 +265,6 @@ maintainer-clean-local:
|
||||
-rm build-aux/install-sh
|
||||
-rm build-aux/ltmain.sh
|
||||
-rm build-aux/missing
|
||||
-rm cyassl-config
|
||||
-rmdir build-aux
|
||||
-rm configure
|
||||
-rm config.log
|
||||
|
||||
23
configure.ac
23
configure.ac
@ -9015,7 +9015,6 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
|
||||
AC_CONFIG_FILES([Makefile
|
||||
wolfssl/version.h
|
||||
wolfssl/options.h
|
||||
cyassl/options.h
|
||||
support/wolfssl.pc
|
||||
rpm/spec
|
||||
wolfcrypt/test/test_paths.h
|
||||
@ -9159,28 +9158,6 @@ echo "" >> $OPTION_FILE
|
||||
echo "#endif /* WOLFSSL_OPTIONS_H */" >> $OPTION_FILE
|
||||
echo "" >> $OPTION_FILE
|
||||
|
||||
#backwards compatibility for those who have included options or version
|
||||
touch cyassl/options.h
|
||||
echo "/* cyassl options.h" > cyassl/options.h
|
||||
echo " * generated from wolfssl/options.h" >> cyassl/options.h
|
||||
echo " */" >> cyassl/options.h
|
||||
|
||||
while read -r line
|
||||
do
|
||||
echo "$line" >> cyassl/options.h
|
||||
done < $OPTION_FILE
|
||||
|
||||
# switch ifdef protection in cyassl/option.h to CYASSL_OPTONS_H, remove bak
|
||||
sed -i.bak 's/WOLFSSL_OPTIONS_H/CYASSL_OPTIONS_H/g' cyassl/options.h
|
||||
|
||||
# workaround for mingw sed that may get "Permission denied" trying to preserve permissions
|
||||
case $host_os in
|
||||
mingw*)
|
||||
chmod u+w cyassl/options.h ;;
|
||||
esac
|
||||
|
||||
rm cyassl/options.h.bak
|
||||
|
||||
if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "$ENABLED_LINUXKM" = "no"
|
||||
then
|
||||
SAVE_CFLAGS=$CFLAGS
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <cyassl/ssl.h>
|
||||
|
||||
/* Force enable the compatibility macros for this example */
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
#include <cyassl/error-ssl.h>
|
||||
#endif
|
||||
|
||||
@ -97,7 +97,7 @@ void echoclient_test(void* args)
|
||||
char** argv = 0;
|
||||
#endif
|
||||
word16 port;
|
||||
char buffer[CYASSL_MAX_ERROR_SZ];
|
||||
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
||||
|
||||
((func_args*)args)->return_code = -1; /* error state */
|
||||
|
||||
@ -118,11 +118,11 @@ void echoclient_test(void* args)
|
||||
if (!fin) err_sys("can't open input file");
|
||||
if (!fout) err_sys("can't open output file");
|
||||
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
doDTLS = 1;
|
||||
#endif
|
||||
|
||||
#ifdef CYASSL_LEANPSK
|
||||
#ifdef WOLFSSL_LEANPSK
|
||||
doPSK = 1;
|
||||
#endif
|
||||
#if defined(NO_RSA) && !defined(HAVE_ECC) && !defined(HAVE_ED25519) && \
|
||||
@ -137,7 +137,7 @@ void echoclient_test(void* args)
|
||||
port = yasslPort;
|
||||
#endif
|
||||
|
||||
#if defined(CYASSL_DTLS)
|
||||
#if defined(WOLFSSL_DTLS)
|
||||
#ifdef WOLFSSL_DTLS13
|
||||
method = wolfDTLSv1_3_client_method();
|
||||
#elif !defined(WOLFSSL_NO_TLS12)
|
||||
@ -178,7 +178,7 @@ void echoclient_test(void* args)
|
||||
err_sys("can't load ca buffer");
|
||||
#endif
|
||||
|
||||
#if defined(CYASSL_SNIFFER)
|
||||
#if defined(WOLFSSL_SNIFFER)
|
||||
/* Only set if not running testsuite */
|
||||
if (XSTRSTR(argv[0], "testsuite") == NULL) {
|
||||
/* don't use EDH, can't sniff tmp keys */
|
||||
@ -237,7 +237,7 @@ void echoclient_test(void* args)
|
||||
tcp_connect(&sockfd, yasslIP, port, doDTLS, 0, ssl);
|
||||
|
||||
SSL_set_fd(ssl, sockfd);
|
||||
#if defined(USE_WINDOWS_API) && defined(CYASSL_DTLS) && defined(NO_MAIN_DRIVER)
|
||||
#if defined(USE_WINDOWS_API) && defined(WOLFSSL_DTLS) && defined(NO_MAIN_DRIVER)
|
||||
/* let echoserver bind first, TODO: add Windows signal like pthreads does */
|
||||
Sleep(100);
|
||||
#endif
|
||||
@ -319,7 +319,7 @@ void echoclient_test(void* args)
|
||||
LIBCALL_CHECK_RET(fflush(fout));
|
||||
sendSz -= ret;
|
||||
}
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
else if (wolfSSL_dtls(ssl) && err == DECRYPT_ERROR) {
|
||||
/* This condition is OK. The packet should be dropped
|
||||
* silently when there is a decrypt or MAC error on
|
||||
@ -336,7 +336,7 @@ void echoclient_test(void* args)
|
||||
}
|
||||
|
||||
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
strncpy(msg, "break", 6);
|
||||
sendSz = (int)strlen(msg);
|
||||
/* try to tell server done */
|
||||
@ -395,10 +395,10 @@ void echoclient_test(void* args)
|
||||
args.return_code = 0;
|
||||
|
||||
CyaSSL_Init();
|
||||
#if defined(DEBUG_CYASSL) && !defined(WOLFSSL_MDK_SHELL)
|
||||
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_MDK_SHELL)
|
||||
CyaSSL_Debugging_ON();
|
||||
#endif
|
||||
#ifndef CYASSL_TIRTOS
|
||||
#ifndef WOLFSSL_TIRTOS
|
||||
ChangeToWolfRoot();
|
||||
#endif
|
||||
#ifndef NO_WOLFSSL_CLIENT
|
||||
|
||||
@ -82,11 +82,11 @@ static void SignalReady(void* args, word16 port)
|
||||
}
|
||||
|
||||
|
||||
THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args)
|
||||
{
|
||||
SOCKET_T sockfd = 0;
|
||||
CYASSL_METHOD* method = 0;
|
||||
CYASSL_CTX* ctx = 0;
|
||||
WOLFSSL_METHOD* method = 0;
|
||||
WOLFSSL_CTX* ctx = 0;
|
||||
|
||||
int ret = 0;
|
||||
int doDTLS = 0;
|
||||
@ -97,7 +97,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
word16 port;
|
||||
int argc = ((func_args*)args)->argc;
|
||||
char** argv = ((func_args*)args)->argv;
|
||||
char buffer[CYASSL_MAX_ERROR_SZ];
|
||||
char buffer[WOLFSSL_MAX_ERROR_SZ];
|
||||
#ifdef HAVE_TEST_SESSION_TICKET
|
||||
MyTicketCtx myTicketCtx;
|
||||
#endif
|
||||
@ -116,19 +116,19 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
|
||||
((func_args*)args)->return_code = -1; /* error state */
|
||||
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
doDTLS = 1;
|
||||
#endif
|
||||
|
||||
#if (defined(NO_RSA) && !defined(HAVE_ECC) && !defined(HAVE_ED25519) && \
|
||||
!defined(HAVE_ED448)) || defined(CYASSL_LEANPSK)
|
||||
!defined(HAVE_ED448)) || defined(WOLFSSL_LEANPSK)
|
||||
doPSK = 1;
|
||||
#else
|
||||
doPSK = 0;
|
||||
#endif
|
||||
|
||||
#if defined(NO_MAIN_DRIVER) && !defined(CYASSL_SNIFFER) && \
|
||||
!defined(WOLFSSL_MDK_SHELL) && !defined(CYASSL_TIRTOS) && \
|
||||
#if defined(NO_MAIN_DRIVER) && !defined(WOLFSSL_SNIFFER) && \
|
||||
!defined(WOLFSSL_MDK_SHELL) && !defined(WOLFSSL_TIRTOS) && \
|
||||
!defined(USE_WINDOWS_API)
|
||||
/* Let tcp_listen assign port */
|
||||
port = 0;
|
||||
@ -141,13 +141,13 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
useAnyAddr = 1;
|
||||
#endif
|
||||
|
||||
#ifdef CYASSL_TIRTOS
|
||||
#ifdef WOLFSSL_TIRTOS
|
||||
fdOpenSession(Task_self());
|
||||
#endif
|
||||
|
||||
tcp_listen(&sockfd, &port, useAnyAddr, doDTLS, 0);
|
||||
|
||||
#if defined(CYASSL_DTLS)
|
||||
#if defined(WOLFSSL_DTLS)
|
||||
#ifdef WOLFSSL_DTLS13
|
||||
method = wolfDTLSv1_3_server_method();
|
||||
#elif !defined(WOLFSSL_NO_TLS12)
|
||||
@ -181,7 +181,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
|
||||
#ifndef NO_FILESYSTEM
|
||||
if (doPSK == 0) {
|
||||
#if defined(HAVE_ECC) && !defined(CYASSL_SNIFFER)
|
||||
#if defined(HAVE_ECC) && !defined(WOLFSSL_SNIFFER)
|
||||
/* ecc */
|
||||
if (CyaSSL_CTX_use_certificate_file(ctx, eccCertFile, WOLFSSL_FILETYPE_PEM)
|
||||
!= WOLFSSL_SUCCESS)
|
||||
@ -192,7 +192,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
!= WOLFSSL_SUCCESS)
|
||||
err_sys("can't load server key file, "
|
||||
"Please run from wolfSSL home dir");
|
||||
#elif defined(HAVE_ED25519) && !defined(CYASSL_SNIFFER)
|
||||
#elif defined(HAVE_ED25519) && !defined(WOLFSSL_SNIFFER)
|
||||
/* ed25519 */
|
||||
if (CyaSSL_CTX_use_certificate_chain_file(ctx, edCertFile)
|
||||
!= WOLFSSL_SUCCESS)
|
||||
@ -203,7 +203,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
!= WOLFSSL_SUCCESS)
|
||||
err_sys("can't load server key file, "
|
||||
"Please run from wolfSSL home dir");
|
||||
#elif defined(HAVE_ED448) && !defined(CYASSL_SNIFFER)
|
||||
#elif defined(HAVE_ED448) && !defined(WOLFSSL_SNIFFER)
|
||||
/* ed448 */
|
||||
if (CyaSSL_CTX_use_certificate_chain_file(ctx, ed448CertFile)
|
||||
!= WOLFSSL_SUCCESS)
|
||||
@ -243,7 +243,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CYASSL_SNIFFER)
|
||||
#if defined(WOLFSSL_SNIFFER)
|
||||
/* Only set if not running testsuite */
|
||||
if (XSTRSTR(argv[0], "testsuite") == NULL) {
|
||||
/* don't use EDH, can't sniff tmp keys */
|
||||
@ -295,8 +295,8 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
SignalReady(args, port);
|
||||
|
||||
while (!shutDown) {
|
||||
CYASSL* ssl = NULL;
|
||||
CYASSL* write_ssl = NULL; /* may have separate w/ HAVE_WRITE_DUP */
|
||||
WOLFSSL* ssl = NULL;
|
||||
WOLFSSL* write_ssl = NULL; /* may have separate w/ HAVE_WRITE_DUP */
|
||||
char command[SVR_COMMAND_SIZE+1];
|
||||
int clientfd;
|
||||
int firstRead = 1;
|
||||
@ -304,7 +304,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
int err = 0;
|
||||
SOCKADDR_IN_T client;
|
||||
socklen_t client_len = sizeof(client);
|
||||
#ifndef CYASSL_DTLS
|
||||
#ifndef WOLFSSL_DTLS
|
||||
clientfd = accept(sockfd, (struct sockaddr*)&client,
|
||||
(ACCEPT_THIRD_T)&client_len);
|
||||
#else
|
||||
@ -326,7 +326,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
ssl = CyaSSL_new(ctx);
|
||||
if (ssl == NULL) err_sys("SSL_new failed");
|
||||
CyaSSL_set_fd(ssl, clientfd);
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
wolfSSL_dtls_set_peer(ssl, &client, client_len);
|
||||
#endif
|
||||
#if !defined(NO_FILESYSTEM) && !defined(NO_DH) && !defined(NO_ASN)
|
||||
@ -484,7 +484,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
err_sys("SSL_write echo failed");
|
||||
}
|
||||
}
|
||||
#ifndef CYASSL_DTLS
|
||||
#ifndef WOLFSSL_DTLS
|
||||
CyaSSL_shutdown(ssl);
|
||||
#endif
|
||||
#ifdef HAVE_WRITE_DUP
|
||||
@ -492,7 +492,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
#endif
|
||||
CyaSSL_free(ssl);
|
||||
CloseSocket(clientfd);
|
||||
#ifdef CYASSL_DTLS
|
||||
#ifdef WOLFSSL_DTLS
|
||||
tcp_listen(&sockfd, &port, useAnyAddr, doDTLS, 0);
|
||||
SignalReady(args, port);
|
||||
#endif
|
||||
@ -513,7 +513,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
ecc_fp_free(); /* free per thread cache */
|
||||
#endif
|
||||
|
||||
#ifdef CYASSL_TIRTOS
|
||||
#ifdef WOLFSSL_TIRTOS
|
||||
fdCloseSession(Task_self());
|
||||
#endif
|
||||
|
||||
@ -525,7 +525,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
wolfAsync_DevClose(&devId);
|
||||
#endif
|
||||
|
||||
#ifndef CYASSL_TIRTOS
|
||||
#ifndef WOLFSSL_TIRTOS
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
@ -552,7 +552,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
|
||||
args.return_code = 0;
|
||||
|
||||
CyaSSL_Init();
|
||||
#if defined(DEBUG_CYASSL) && !defined(CYASSL_MDK_SHELL)
|
||||
#if defined(DEBUG_WOLFSSL) && !defined(WOLFSSL_MDK_SHELL)
|
||||
CyaSSL_Debugging_ON();
|
||||
#endif
|
||||
ChangeToWolfRoot();
|
||||
|
||||
91
rpm/spec.in
91
rpm/spec.in
@ -86,97 +86,6 @@ mkdir -p $RPM_BUILD_ROOT/
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog.md COPYING README README.md
|
||||
%{_bindir}/wolfssl-config
|
||||
%{_includedir}/cyassl/callbacks.h
|
||||
%{_includedir}/cyassl/certs_test.h
|
||||
%{_includedir}/cyassl/crl.h
|
||||
%{_includedir}/cyassl/ctaocrypt/aes.h
|
||||
%{_includedir}/cyassl/ctaocrypt/arc4.h
|
||||
%{_includedir}/cyassl/ctaocrypt/asn.h
|
||||
%{_includedir}/cyassl/ctaocrypt/asn_public.h
|
||||
%{_includedir}/cyassl/ctaocrypt/blake2-impl.h
|
||||
%{_includedir}/cyassl/ctaocrypt/blake2-int.h
|
||||
%{_includedir}/cyassl/ctaocrypt/blake2.h
|
||||
%{_includedir}/cyassl/ctaocrypt/camellia.h
|
||||
%{_includedir}/cyassl/ctaocrypt/chacha.h
|
||||
%{_includedir}/cyassl/ctaocrypt/coding.h
|
||||
%{_includedir}/cyassl/ctaocrypt/compress.h
|
||||
%{_includedir}/cyassl/ctaocrypt/des3.h
|
||||
%{_includedir}/cyassl/ctaocrypt/dh.h
|
||||
%{_includedir}/cyassl/ctaocrypt/dsa.h
|
||||
%{_includedir}/cyassl/ctaocrypt/ecc.h
|
||||
%{_includedir}/cyassl/ctaocrypt/error-crypt.h
|
||||
%{_includedir}/cyassl/ctaocrypt/fips_test.h
|
||||
%{_includedir}/cyassl/ctaocrypt/hmac.h
|
||||
%{_includedir}/cyassl/ctaocrypt/integer.h
|
||||
%{_includedir}/cyassl/ctaocrypt/logging.h
|
||||
%{_includedir}/cyassl/ctaocrypt/md2.h
|
||||
%{_includedir}/cyassl/ctaocrypt/md4.h
|
||||
%{_includedir}/cyassl/ctaocrypt/md5.h
|
||||
%{_includedir}/cyassl/ctaocrypt/memory.h
|
||||
%{_includedir}/cyassl/ctaocrypt/misc.h
|
||||
%{_includedir}/cyassl/ctaocrypt/mpi_class.h
|
||||
%{_includedir}/cyassl/ctaocrypt/mpi_superclass.h
|
||||
%{_includedir}/cyassl/ctaocrypt/pkcs7.h
|
||||
%{_includedir}/cyassl/ctaocrypt/poly1305.h
|
||||
%{_includedir}/cyassl/ctaocrypt/pwdbased.h
|
||||
%{_includedir}/cyassl/ctaocrypt/random.h
|
||||
%{_includedir}/cyassl/ctaocrypt/ripemd.h
|
||||
%{_includedir}/cyassl/ctaocrypt/rsa.h
|
||||
%{_includedir}/cyassl/ctaocrypt/settings.h
|
||||
%{_includedir}/cyassl/ctaocrypt/settings_comp.h
|
||||
%{_includedir}/cyassl/ctaocrypt/sha.h
|
||||
%{_includedir}/cyassl/ctaocrypt/sha256.h
|
||||
%{_includedir}/cyassl/ctaocrypt/sha512.h
|
||||
%{_includedir}/cyassl/ctaocrypt/tfm.h
|
||||
%{_includedir}/cyassl/ctaocrypt/types.h
|
||||
%{_includedir}/cyassl/ctaocrypt/visibility.h
|
||||
%{_includedir}/cyassl/ctaocrypt/wc_port.h
|
||||
%{_includedir}/cyassl/error-ssl.h
|
||||
%{_includedir}/cyassl/ocsp.h
|
||||
%{_includedir}/cyassl/openssl/asn1.h
|
||||
%{_includedir}/cyassl/openssl/bio.h
|
||||
%{_includedir}/cyassl/openssl/bn.h
|
||||
%{_includedir}/cyassl/openssl/conf.h
|
||||
%{_includedir}/cyassl/openssl/crypto.h
|
||||
%{_includedir}/cyassl/openssl/des.h
|
||||
%{_includedir}/cyassl/openssl/dh.h
|
||||
%{_includedir}/cyassl/openssl/dsa.h
|
||||
%{_includedir}/cyassl/openssl/ec.h
|
||||
%{_includedir}/cyassl/openssl/ec25519.h
|
||||
%{_includedir}/cyassl/openssl/ec448.h
|
||||
%{_includedir}/cyassl/openssl/ecdh.h
|
||||
%{_includedir}/cyassl/openssl/ecdsa.h
|
||||
%{_includedir}/cyassl/openssl/ed25519.h
|
||||
%{_includedir}/cyassl/openssl/ed448.h
|
||||
%{_includedir}/cyassl/openssl/engine.h
|
||||
%{_includedir}/cyassl/openssl/err.h
|
||||
%{_includedir}/cyassl/openssl/evp.h
|
||||
%{_includedir}/cyassl/openssl/hmac.h
|
||||
%{_includedir}/cyassl/openssl/lhash.h
|
||||
%{_includedir}/cyassl/openssl/md4.h
|
||||
%{_includedir}/cyassl/openssl/md5.h
|
||||
%{_includedir}/cyassl/openssl/ocsp.h
|
||||
%{_includedir}/cyassl/openssl/opensslconf.h
|
||||
%{_includedir}/cyassl/openssl/opensslv.h
|
||||
%{_includedir}/cyassl/openssl/ossl_typ.h
|
||||
%{_includedir}/cyassl/openssl/pem.h
|
||||
%{_includedir}/cyassl/openssl/pkcs12.h
|
||||
%{_includedir}/cyassl/openssl/rand.h
|
||||
%{_includedir}/cyassl/openssl/ripemd.h
|
||||
%{_includedir}/cyassl/openssl/rsa.h
|
||||
%{_includedir}/cyassl/openssl/sha.h
|
||||
%{_includedir}/cyassl/openssl/ssl.h
|
||||
%{_includedir}/cyassl/openssl/ssl23.h
|
||||
%{_includedir}/cyassl/openssl/stack.h
|
||||
%{_includedir}/cyassl/openssl/ui.h
|
||||
%{_includedir}/cyassl/openssl/x509.h
|
||||
%{_includedir}/cyassl/openssl/x509v3.h
|
||||
%{_includedir}/cyassl/options.h
|
||||
%{_includedir}/cyassl/sniffer.h
|
||||
%{_includedir}/cyassl/sniffer_error.h
|
||||
%{_includedir}/cyassl/ssl.h
|
||||
%{_includedir}/cyassl/test.h
|
||||
%{_includedir}/cyassl/version.h
|
||||
%{_includedir}/wolfssl/callbacks.h
|
||||
%{_includedir}/wolfssl/certs_test.h
|
||||
%{_includedir}/wolfssl/crl.h
|
||||
|
||||
@ -33,15 +33,6 @@
|
||||
|
||||
#include <wolfssl/wolfcrypt/settings.h>
|
||||
|
||||
/* check old macros @wc_fips */
|
||||
#if defined(USE_CYASSL_MEMORY) && !defined(USE_WOLFSSL_MEMORY)
|
||||
#define USE_WOLFSSL_MEMORY
|
||||
#endif
|
||||
#if defined(CYASSL_MALLOC_CHECK) && !defined(WOLFSSL_MALLOC_CHECK)
|
||||
#define WOLFSSL_MALLOC_CHECK
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
Possible memory options:
|
||||
* NO_WOLFSSL_MEMORY: Disables wolf memory callback support. When not defined settings.h defines USE_WOLFSSL_MEMORY.
|
||||
|
||||
@ -70,18 +70,6 @@ WOLFSSL_LOCAL void GHASH(Gcm* gcm, const byte* a, word32 aSz, const byte* c,
|
||||
#include <wolfssl/wolfcrypt/fips.h>
|
||||
#endif /* HAVE_FIPS_VERSION >= 2 */
|
||||
|
||||
/* included for fips @wc_fips */
|
||||
#if defined(HAVE_FIPS) && \
|
||||
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2))
|
||||
#include <cyassl/ctaocrypt/aes.h>
|
||||
#if defined(CYASSL_AES_COUNTER) && !defined(WOLFSSL_AES_COUNTER)
|
||||
#define WOLFSSL_AES_COUNTER
|
||||
#endif
|
||||
#if !defined(WOLFSSL_AES_DIRECT) && defined(CYASSL_AES_DIRECT)
|
||||
#define WOLFSSL_AES_DIRECT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef WC_NO_RNG
|
||||
#include <wolfssl/wolfcrypt/random.h>
|
||||
#endif
|
||||
|
||||
@ -63,17 +63,9 @@ RSA keys can be used to encrypt, decrypt, sign and verify data.
|
||||
#include "user_rsa.h"
|
||||
#else
|
||||
|
||||
#if defined(HAVE_FIPS) && \
|
||||
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2))
|
||||
/* for fips @wc_fips */
|
||||
#include <cyassl/ctaocrypt/rsa.h>
|
||||
#if defined(CYASSL_KEY_GEN) && !defined(WOLFSSL_KEY_GEN)
|
||||
#define WOLFSSL_KEY_GEN
|
||||
#endif
|
||||
#else
|
||||
#include <wolfssl/wolfcrypt/wolfmath.h>
|
||||
#include <wolfssl/wolfcrypt/random.h>
|
||||
#endif /* HAVE_FIPS && HAVE_FIPS_VERION 1 */
|
||||
#include <wolfssl/wolfcrypt/wolfmath.h>
|
||||
#include <wolfssl/wolfcrypt/random.h>
|
||||
|
||||
#if defined(HAVE_FIPS) && \
|
||||
defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
|
||||
#include <wolfssl/wolfcrypt/fips.h>
|
||||
|
||||
@ -44,8 +44,6 @@
|
||||
#define WC_SHA_DIGEST_SIZE SHA_DIGEST_SIZE
|
||||
#define WC_SHA_PAD_SIZE SHA_PAD_SIZE
|
||||
|
||||
/* for fips @wc_fips */
|
||||
#include <cyassl/ctaocrypt/sha.h>
|
||||
#endif
|
||||
|
||||
#ifdef FREESCALE_LTC_SHA
|
||||
|
||||
@ -56,12 +56,6 @@
|
||||
#define WC_SHA384_PAD_SIZE SHA384_PAD_SIZE
|
||||
#endif /* WOLFSSL_SHA384 */
|
||||
|
||||
#define CYASSL_SHA512
|
||||
#if defined(WOLFSSL_SHA384)
|
||||
#define CYASSL_SHA384
|
||||
#endif
|
||||
/* for fips @wc_fips */
|
||||
#include <cyassl/ctaocrypt/sha512.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -31,9 +31,6 @@
|
||||
* the same as a non-FIPS build. */
|
||||
#if defined(HAVE_FIPS) && \
|
||||
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2))
|
||||
#include <cyassl/ctaocrypt/visibility.h>
|
||||
#define WOLFSSL_API CYASSL_API
|
||||
#define WOLFSSL_LOCAL CYASSL_LOCAL
|
||||
#else
|
||||
|
||||
/* WOLFSSL_API is used for the public API symbols.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user