feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge branch 'master' of https://github.com/BrianAker/cyassl

Browse Source
This commit is contained in:
toddouska
2012-10-22 10:56:53 -07:00
parent 10306013bb ac998a0f7c
commit cb08eb672e
16 changed files with 381 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@@ -15,13 +15,10 @@ check_PROGRAMS =
EXTRA_HEADERS = EXTRA_HEADERS =
BUILT_SOURCES= BUILT_SOURCES=
EXTRA_DIST= EXTRA_DIST=
doc_DATA= dist_doc_DATA=
exampledir = $(docdir)/@PACKAGE@/example exampledir = $(docdir)/example
example_DATA= dist_example_DATA=
EXTRA_DIST+= $(example_DATA)
EXTRA_DIST+= $(doc_DATA)
ACLOCAL_AMFLAGS= -I m4 ACLOCAL_AMFLAGS= -I m4
@@ -50,6 +47,7 @@ include examples/echoserver/include.am
include testsuite/include.am include testsuite/include.am
include tests/include.am include tests/include.am
include sslSniffer/sslSnifferTest/include.am include sslSniffer/sslSnifferTest/include.am
include rpm/include.am
TESTS += $(check_PROGRAMS) TESTS += $(check_PROGRAMS)
test: check test: check

2
certs/include.am
View File

@@ -34,7 +34,7 @@ EXTRA_DIST += \
certs/ecc-key.der certs/ecc-key.der
doc_DATA+= certs/taoCert.txt dist_doc_DATA+= certs/taoCert.txt
EXTRA_DIST+= certs/ntru-key.raw EXTRA_DIST+= certs/ntru-key.raw

61
configure.ac
View File

@@ -44,6 +44,10 @@ LT_INIT([win32-dll])
LT_LANG([C++]) LT_LANG([C++])
LT_LANG([C]) LT_LANG([C])
gl_VISIBILITY gl_VISIBILITY
AS_IF([ test -n "$CFLAG_VISIBILITY" ], [
AM_CPPFLAGS="$AM_CPPFLAGS $CFLAG_VISIBILITY"
CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"
])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -119,12 +123,18 @@ fi
AC_ARG_ENABLE(singleThreaded, AC_ARG_ENABLE(singleThreaded,
[ --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)], [ --enable-singleThreaded Enable CyaSSL single threaded (default: disabled)],
[ ENABLED_SINGLETHREADED=$enableval ], [ ENABLED_SINGLETHREADED=$enableval ],
[ ENABLED_SINGLETHREADED=no ] [ ENABLED_SINGLETHREADED=no ])
)
if test "$ENABLED_SINGLETHREADED" = "yes" AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
then AX_PTHREAD([
AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
fi AM_CFLAGS="-D_POSIX_THREADS $AM_CFLAGS"
],[
ENABLED_SINGLETHREADED=yes
])
])
AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="-DSINGLE_THREADED $AM_CFLAGS" ])
# DTLS # DTLS
@@ -268,18 +278,17 @@ fi
# SNIFFER # SNIFFER
AC_ARG_ENABLE(sniffer, AC_ARG_ENABLE([sniffer],
[ --enable-sniffer Enable CyaSSL sniffer support (default: disabled)], [AS_HELP_STRING([--enable-sniffer],[ Enable CyaSSL sniffer support (default: disabled) ])],[
[ ENABLED_SNIFFER=$enableval ], AS_IF([ test "x$enableval" = "xyes" ],[ AC_CHECK_HEADERS([pcap/pcap.h],[
[ ENABLED_SNIFFER=no ] ENABLED_SNIFFER=yes
) AM_CFLAGS="$AM_CFLAGS -DCYASSL_SNIFFER -DOPENSSL_EXTRA"
],[ ENABLED_SNIFFER=no ]) ])
],[
ENABLED_SNIFFER=no
])
if test "$ENABLED_SNIFFER" = "yes" AM_CONDITIONAL([BUILD_SNIFFER], [ test "x$ENABLED_SNIFFER" = "xyes" ])
then
AM_CFLAGS="$AM_CFLAGS -DCYASSL_SNIFFER -DOPENSSL_EXTRA"
fi
AM_CONDITIONAL([BUILD_SNIFFER], [test "x$ENABLED_SNIFFER" = "xyes"])
# AES-GCM # AES-GCM
AC_ARG_ENABLE(aesgcm, AC_ARG_ENABLE(aesgcm,
@@ -664,13 +673,6 @@ then
fi fi
fi fi
AX_PTHREAD([
AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
],
[
AC_DEFINE([HAVE_PTHREAD], [0], [Define if you have POSIX threads libraries and header files.])
])
LIB_SOCKET_NSL LIB_SOCKET_NSL
AC_ARG_ENABLE(gcc-hardening, AC_ARG_ENABLE(gcc-hardening,
@@ -685,7 +687,7 @@ fi])
AX_HARDEN_CC_COMPILER_FLAGS AX_HARDEN_CC_COMPILER_FLAGS
CREATE_HEX_VERSION CREATE_HEX_VERSION
AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY" AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CFLAGS) AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_LDFLAGS) AC_SUBST(AM_LDFLAGS)
@@ -694,6 +696,7 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([cyassl/version.h]) AC_CONFIG_FILES([cyassl/version.h])
AC_CONFIG_FILES([support/libcyassl.pc]) AC_CONFIG_FILES([support/libcyassl.pc])
AC_CONFIG_FILES([rpm/spec])
AC_OUTPUT AC_OUTPUT
@@ -708,8 +711,16 @@ echo " * C Flags: $CFLAGS"
echo " * C++ Compiler: $CXX_VERSION" echo " * C++ Compiler: $CXX_VERSION"
echo " * C++ Flags: $CXXFLAGS" echo " * C++ Flags: $CXXFLAGS"
echo " * CPP Flags: $CPPFLAGS" echo " * CPP Flags: $CPPFLAGS"
echo " * LIB Flags: $LIB"
echo " * Assertions enabled: $ac_cv_assert" echo " * Assertions enabled: $ac_cv_assert"
echo " * Debug enabled: $with_debug" echo " * Debug enabled: $with_debug"
echo " * Warnings as failure: $ac_cv_warnings_as_errors" echo " * Warnings as failure: $ac_cv_warnings_as_errors"
echo
echo " Features "
echo " * sniffer: $ENABLED_SNIFFER"
echo " * Enable smallest build: $ENABLED_SMALL"
echo " * Single threaded: $ENABLED_SINGLETHREADED"
echo " * DTLS: $ENABLED_DTLS"
echo " * Enable extra OpenSSL API: $ENABLED_OPENSSLEXTRA"
echo "" echo ""
echo "---" echo "---"

10
ctaocrypt/test/test.h
View File

@@ -1,4 +1,4 @@
/* test.c /* ctaocrypt/test/test.h
* *
* Copyright (C) 2006-2012 Sawtooth Consulting Ltd. * Copyright (C) 2006-2012 Sawtooth Consulting Ltd.
* *
@@ -21,5 +21,13 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
void ctaocrypt_test(void* args); void ctaocrypt_test(void* args);
#ifdef __cplusplus
} /* extern "C" */
#endif

3
cyassl/test.h
View File

@@ -201,7 +201,8 @@ static INLINE int mygetopt(int argc, char** argv, const char* optstring)
} }
c = *next++; c = *next++;
cp = strchr(optstring, c); // The C++ strchr returns a different value
cp = (char*)strchr(optstring, c);
if (cp == NULL || c == ':') if (cp == NULL || c == ':')
return '?'; return '?';

35
cyassl/version.h
View File

@@ -1,35 +0,0 @@
/* cyassl_version.h.in
*
* Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
*
* This file is part of CyaSSL.
*
* CyaSSL is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* CyaSSL is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#define LIBCYASSL_VERSION_STRING "2.4.0"
#define LIBCYASSL_VERSION_HEX 0x02004000
#ifdef __cplusplus
}
#endif

2
doc/include.am
View File

@@ -2,4 +2,4 @@
# included from Top Level Makefile.am # included from Top Level Makefile.am
# All paths should be given relative to the root # All paths should be given relative to the root
doc_DATA+= doc/README.txt dist_doc_DATA+= doc/README.txt

2
examples/client/include.am
View File

@@ -10,4 +10,4 @@ EXTRA_DIST += examples/client/client.sln
EXTRA_DIST += examples/client/client-ntru.vcproj EXTRA_DIST += examples/client/client-ntru.vcproj
EXTRA_DIST += examples/client/client.vcproj EXTRA_DIST += examples/client/client.vcproj
example_DATA+= examples/client/client.c dist_example_DATA+= examples/client/client.c

2
examples/echoclient/include.am
View File

@@ -12,4 +12,4 @@ EXTRA_DIST += examples/echoclient/echoclient.sln
EXTRA_DIST += examples/echoclient/echoclient-ntru.vcproj EXTRA_DIST += examples/echoclient/echoclient-ntru.vcproj
EXTRA_DIST += examples/echoclient/echoclient.vcproj EXTRA_DIST += examples/echoclient/echoclient.vcproj
example_DATA+= examples/echoclient/echoclient.c dist_example_DATA+= examples/echoclient/echoclient.c

2
examples/echoserver/include.am
View File

@@ -12,4 +12,4 @@ EXTRA_DIST += examples/echoserver/echoserver.sln
EXTRA_DIST += examples/echoserver/echoserver-ntru.vcproj EXTRA_DIST += examples/echoserver/echoserver-ntru.vcproj
EXTRA_DIST += examples/echoserver/echoserver.vcproj EXTRA_DIST += examples/echoserver/echoserver.vcproj
example_DATA+= examples/echoserver/echoserver.c dist_example_DATA+= examples/echoserver/echoserver.c

2
examples/server/include.am
View File

@@ -12,4 +12,4 @@ EXTRA_DIST += examples/server/server.sln
EXTRA_DIST += examples/server/server-ntru.vcproj EXTRA_DIST += examples/server/server-ntru.vcproj
EXTRA_DIST += examples/server/server.vcproj EXTRA_DIST += examples/server/server.vcproj
example_DATA+= examples/server/server.c dist_example_DATA+= examples/server/server.c

239
m4/ax_harden_compiler_flags.m4
View File

@@ -55,12 +55,12 @@
# AX_APPEND_COMPILE_FLAGS([-Wstack-protector]) -- Issues on 32bit compile # AX_APPEND_COMPILE_FLAGS([-Wstack-protector]) -- Issues on 32bit compile
# AX_APPEND_COMPILE_FLAGS([-fstack-protector-all]) -- Issues on 32bit compile # AX_APPEND_COMPILE_FLAGS([-fstack-protector-all]) -- Issues on 32bit compile
# AX_APPEND_COMPILE_FLAGS([-Wlong-long]) -- Don't turn on for compatibility issues memcached_stat_st # AX_APPEND_COMPILE_FLAGS([-Wlong-long]) -- Don't turn on for compatibility issues memcached_stat_st
# AX_APPEND_COMPILE_FLAGS([-Wold-style-definition],,[$ax_append_compile_flags_extra]) # AX_APPEND_COMPILE_FLAGS([-Wold-style-definition],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-std=c99],,[$ax_append_compile_flags_extra]) # AX_APPEND_COMPILE_FLAGS([-std=c99],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-Wlogical-op],,[$ax_append_compile_flags_extra]) # AX_APPEND_COMPILE_FLAGS([-Wlogical-op],,[$ax_append_compile_cflags_extra])
# AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_flags_extra]) # AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_cflags_extra])
#serial 3 #serial 4
AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [ AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
AC_REQUIRE([AX_CHECK_LINK_FLAG]) AC_REQUIRE([AX_CHECK_LINK_FLAG])
@@ -68,15 +68,28 @@
AC_REQUIRE([AX_DEBUG]) AC_REQUIRE([AX_DEBUG])
AC_REQUIRE([AX_CXX_COMPILER_VERSION]) AC_REQUIRE([AX_CXX_COMPILER_VERSION])
ax_append_compile_flags_extra= dnl If we are inside of VCS we append -Werror, otherwise we just use it to test other flags
AS_IF([test "$CLANG" = "yes"],[ax_append_compile_flags_extra="-Werror"]) AX_HARDEN_LIB=
ax_append_compile_link_flags_extra=
AS_IF([test "$ac_cv_vcs_checkout" = "yes"], [ AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],[
AX_CHECK_LINK_FLAG([-Werror]) AX_CHECK_LINK_FLAG([-Werror],[
ax_append_compile_flags_extra= AX_HARDEN_LIB="-Werror $AX_HARDEN_LIB"
]) ])
AX_CHECK_LINK_FLAG([-z relro -z now],,[$ax_append_compile_flags_extra]) ],[
AX_CHECK_LINK_FLAG([-pie],,[$ax_append_compile_flags_extra]) AX_CHECK_LINK_FLAG([-Werror],[
ax_append_compile_link_flags_extra='-Werror'
])
])
AX_CHECK_LINK_FLAG([-z relro -z now],[
AX_HARDEN_LIB="-z relro -z now $AX_HARDEN_LIB"
],,[$ax_append_compile_link_flags_extra])
AX_CHECK_LINK_FLAG([-pie],[
AX_HARDEN_LIB="-pie $AX_HARDEN_LIB"
],,[$ax_append_compile_link_flags_extra])
LIB="$LIB $AX_HARDEN_LIB"
]) ])
AC_DEFUN([AX_HARDEN_CC_COMPILER_FLAGS], [ AC_DEFUN([AX_HARDEN_CC_COMPILER_FLAGS], [
@@ -84,132 +97,140 @@
AC_REQUIRE([AX_HARDEN_LINKER_FLAGS]) AC_REQUIRE([AX_HARDEN_LINKER_FLAGS])
AC_LANG_PUSH([C]) AC_LANG_PUSH([C])
CFLAGS=
AS_IF([test "$ax_enable_debug" = "yes"], [
AX_APPEND_COMPILE_FLAGS([-g])
AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_flags_extra])
],[])
ac_cv_warnings_as_errors=no ac_cv_warnings_as_errors=no
AS_IF([test "$ac_cv_vcs_checkout" = "yes"], [ ax_append_compile_cflags_extra=
AX_APPEND_COMPILE_FLAGS([-Werror],,[$ax_append_compile_flags_extra]) AS_IF([test "$ac_cv_vcs_checkout" = "yes"],[
AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror])
ac_cv_warnings_as_errors=yes ac_cv_warnings_as_errors=yes
],[ ],[
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra])
]) ])
AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-g])
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,,[$ax_append_compile_flags_extra]) AS_IF([test "$ax_enable_debug" = "yes"], [
AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_flags_extra]) ],[
dnl Anything below this comment please keep sorted. AX_APPEND_COMPILE_FLAGS([-O2],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_flags_extra]) ])
AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],,[$ax_append_compile_flags_extra])
dnl Not in use -Wc++-compat
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnested-externs],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Woverride-init],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_flags_extra])
AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_flags_extra])
AC_LANG_POP
AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_cflags_extra])
dnl Anything below this comment please keep sorted.
AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast],,[$ax_append_compile_cflags_extra])
dnl Not in use -Wc++-compat
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnested-externs],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Woverride-init],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-sign],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_cflags_extra])
AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_cflags_extra])
AC_LANG_POP
]) ])
AC_DEFUN([AX_HARDEN_CXX_COMPILER_FLAGS], [ AC_DEFUN([AX_HARDEN_CXX_COMPILER_FLAGS], [
AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS]) AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS])
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
CXXFLAGS=
AS_IF([test "$ax_enable_debug" = "yes" ], [ ax_append_compile_cxxflags_extra=
AX_APPEND_COMPILE_FLAGS([-g],,[$ax_append_compile_flags_extra]) AS_IF([test "$ac_cv_warnings_as_errors" = "yes"],[
AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror])
AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_flags_extra])
],[ ],[
AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cxxflags_extra])
])
AX_APPEND_COMPILE_FLAGS([-g],,[$ax_append_compile_cxxflags_extra])
AS_IF([test "$ax_enable_debug" = "yes" ], [
AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cxxflags_extra])
],[
AX_APPEND_COMPILE_FLAGS([-O2],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2],,[$ax_append_compile_cxxflags_extra])
]) ])
AS_IF([test "$ac_cv_vcs_checkout" = "yes" ], [ AS_IF([test "$ac_cv_vcs_checkout" = "yes" ], [
AX_APPEND_COMPILE_FLAGS([-Werror],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Werror],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_cxxflags_extra])
],[ ],[
AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_cxxflags_extra])
]) ])
AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wall],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wno-strict-aliasing],,,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wextra],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunknown-pragmas],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wthis-test-should-fail],,[$ax_append_compile_cxxflags_extra])
dnl Anything below this comment please keep sorted. dnl Anything below this comment please keep sorted.
AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Waddress],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Warray-bounds],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wcomment],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wfloat-equal],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wformat=2],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wnormalized=id],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wpointer-arith],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wredundant-decls],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wshadow],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wsign-compare],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wswitch-enum],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wundef],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wc++11-compat],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wc++11-compat],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-result],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wunused-variable],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wwrite-strings],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-Wformat-security],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_cxxflags_extra])
AX_APPEND_COMPILE_FLAGS([-fwrapv],,[$ax_append_compile_flags_extra])
AC_LANG_POP AC_LANG_POP
]) ])
AC_DEFUN([AX_HARDEN_COMPILER_FLAGS], [ AC_DEFUN([AX_HARDEN_COMPILER_FLAGS], [
AC_REQUIRE([AX_HARDEN_CXX_COMPILER_FLAGS],,[$ax_append_compile_flags_extra]) AC_REQUIRE([AX_HARDEN_CXX_COMPILER_FLAGS])
]) ])
AC_DEFUN([AX_CC_OTHER_FLAGS], [ AC_DEFUN([AX_CC_OTHER_FLAGS], [
AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
AC_REQUIRE([AX_HARDEN_LINKER_FLAGS]) AC_REQUIRE([AX_HARDEN_CC_COMPILER_FLAGS])
AC_LANG_PUSH([C]) AC_LANG_PUSH([C])
AX_APPEND_COMPILE_FLAGS([-pipe],,[$ax_append_compile_flags_extra]) AX_APPEND_COMPILE_FLAGS([-pipe],,[$ax_append_compile_cflags_extra])
AC_LANG_POP AC_LANG_POP
]) ])

8
m4/ax_pthread.m4
View File

@@ -82,7 +82,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 18 #serial 19
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
AC_DEFUN([AX_PTHREAD], [ AC_DEFUN([AX_PTHREAD], [
@@ -159,8 +159,12 @@ case ${host_os} in
ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
;; ;;
darwin12*)
ax_pthread_flags="$ax_pthread_flags"
;;
darwin*) darwin*)
ax_pthread_flags="-pthread $ax_pthread_flags" ax_pthread_flags="-pthreads $ax_pthread_flags"
;; ;;
esac esac

37
rpm/include.am Normal file
View File

@@ -0,0 +1,37 @@
# vim:ft=automake
rpm-build: rpm/spec dist
@rm -f *.rpm
@rm -f ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm
@rm -f ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm
@mkdir -p ~/rpmbuild/BUILD/
@mkdir -p ~/rpmbuild/RPMS/i386/
@mkdir -p ~/rpmbuild/RPMS/i686/
@mkdir -p ~/rpmbuild/RPMS/noarch/
@mkdir -p ~/rpmbuild/RPMS/x86_64/
@mkdir -p ~/rpmbuild/SOURCES/
@mkdir -p ~/rpmbuild/SPECS/
@mkdir -p ~/rpmbuild/SRPMS/
@cp $(PACKAGE)-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
@rpmbuild -ba --clean rpm/spec
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm .
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm .
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
@cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
rpm-sign: rpm-build
@rpm --addsign *.rpm
@rpm --checksig *.rpm
clean-rpm:
@rm -f *.tar.gz
@rm -f *.src.rpm
@rm -f *.rpm
rpm: rpm-build
release: rpm-sign
auto-rpmbuild:
@auto-br-rpmbuild -ba rpm/spec

144
rpm/spec.in Normal file
View File

@@ -0,0 +1,144 @@
Summary: Embedded SSL Library
Name: @PACKAGE@
Version: @VERSION@
Release: 1
License: BSD
Group: System Environment/Libraries
BuildRequires: bison
URL: http://www.yassl.com/yaSSL/Home.html
Packager: Brian Aker <brian@tangent.org>
Source: http://yassl.com/yaSSL/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
%description
Misc tools for Yassl.
%package devel
Summary: Header files and development libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
This package contains the header files and development libraries
for %{name}. If you like to develop programs using %{name},
you will need to install %{name}-devel.
%prep
%setup -q
%configure
%build
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
mkdir -p $RPM_BUILD_ROOT/
%check
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_docdir}/cyassl/taoCert.txt
%{_docdir}/cyassl/example/echoserver.c
%{_docdir}/cyassl/example/server.c
%{_docdir}/cyassl/example/echoclient.c
%{_docdir}/cyassl/example/client.c
%{_docdir}/cyassl/README.txt
%files devel
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libcyassl.a
%{_libdir}/libcyassl.la
%{_libdir}/libcyassl.so
%{_libdir}/libcyassl.so.3
%{_libdir}/libcyassl.so.3.0.3
%{_includedir}/cyassl/callbacks.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/coding.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.h
%{_includedir}/cyassl/ctaocrypt/hc128.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/pwdbased.h
%{_includedir}/cyassl/ctaocrypt/rabbit.h
%{_includedir}/cyassl/ctaocrypt/random.h
%{_includedir}/cyassl/ctaocrypt/ripemd.h
%{_includedir}/cyassl/ctaocrypt/rsa.h
%{_includedir}/cyassl/ctaocrypt/settings.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/error.h
%{_includedir}/cyassl/internal.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/ecdsa.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/stack.h
%{_includedir}/cyassl/openssl/ui.h
%{_includedir}/cyassl/openssl/x509.h
%{_includedir}/cyassl/openssl/x509v3.h
%{_includedir}/cyassl/sniffer.h
%{_includedir}/cyassl/sniffer_error.h
%{_includedir}/cyassl/ssl.h
%{_includedir}/cyassl/test.h
%{_includedir}/cyassl/version.h
%changelog
* Fri Oct 20 2012 Brian Aker <brian@tangent.org> - 0.1-1
- Initial package

10
src/internal.c
View File

@@ -7627,24 +7627,28 @@ int SetCipherList(Suites* s, const char* list)
int InitMutex(CyaSSL_Mutex* m) int InitMutex(CyaSSL_Mutex* m)
{ {
(void)m;
return 0; return 0;
} }
int FreeMutex(CyaSSL_Mutex* m) int FreeMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }
int LockMutex(CyaSSL_Mutex* m) int LockMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }
int UnLockMutex(CyaSSL_Mutex* m) int UnLockMutex(CyaSSL_Mutex *m)
{ {
(void)m;
return 0; return 0;
} }