From 3d5270236ba78c5c8e04de18ae3730e3fd126f63 Mon Sep 17 00:00:00 2001 From: Todd A Ouska Date: Thu, 2 Jun 2011 15:55:35 -0700 Subject: [PATCH] pre rc2 a --- configure.in | 2 +- ctaocrypt/include/ctc_config.h | 8 +++--- cyassl-iphone.xcodeproj/project.pbxproj | 36 ------------------------- include/openssl/ssl.h | 2 +- src/include.am | 2 +- 5 files changed, 7 insertions(+), 43 deletions(-) diff --git a/configure.in b/configure.in index 1d4cd61a9..53edd66f5 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(cyassl,2.0.0rc1b,http://www.yassl.com) # !!! also change in ssl.h !!! +AC_INIT(cyassl,2.0.0rc2,http://www.yassl.com) # !!! also change in ssl.h !!! AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(ctaocrypt/include/ctc_config.h) AC_CONFIG_MACRO_DIR([m4]) diff --git a/ctaocrypt/include/ctc_config.h b/ctaocrypt/include/ctc_config.h index c0d25be42..5e2a270c1 100644 --- a/ctaocrypt/include/ctc_config.h +++ b/ctaocrypt/include/ctc_config.h @@ -42,7 +42,7 @@ /* Define to 1 or 0, depending whether the compiler supports simple visibility declarations. */ -#define HAVE_VISIBILITY 0 +#define HAVE_VISIBILITY 1 /* Define to the sub-directory in which libtool stores uninstalled libraries. */ @@ -61,13 +61,13 @@ #define PACKAGE_NAME "cyassl" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "cyassl 2.0.0rc1b" +#define PACKAGE_STRING "cyassl 2.0.0rc2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "cyassl" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.0rc1b" +#define PACKAGE_VERSION "2.0.0rc2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -83,7 +83,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.0.0rc1b" +#define VERSION "2.0.0rc2" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/cyassl-iphone.xcodeproj/project.pbxproj b/cyassl-iphone.xcodeproj/project.pbxproj index c06c6641e..cf66814e0 100644 --- a/cyassl-iphone.xcodeproj/project.pbxproj +++ b/cyassl-iphone.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 43C6C2990DDF98D400F2D488 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28A0DDF98D400F2D488 /* hmac.c */; }; 43C6C29A0DDF98D400F2D488 /* integer.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28B0DDF98D400F2D488 /* integer.c */; }; 43C6C29B0DDF98D400F2D488 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28C0DDF98D400F2D488 /* md5.c */; }; - 43C6C29C0DDF98D400F2D488 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28D0DDF98D400F2D488 /* misc.c */; }; 43C6C29D0DDF98D400F2D488 /* random.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28E0DDF98D400F2D488 /* random.c */; }; 43C6C29E0DDF98D400F2D488 /* rsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C28F0DDF98D400F2D488 /* rsa.c */; }; 43C6C29F0DDF98D400F2D488 /* sha.c in Sources */ = {isa = PBXBuildFile; fileRef = 43C6C2900DDF98D400F2D488 /* sha.c */; }; @@ -41,8 +40,6 @@ 43CA4B4712C14EAE0001AF79 /* ctc_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 43CA4B3E12C14EAE0001AF79 /* ctc_aes.h */; }; 43D565650F1EC9A600550C88 /* hc128.c in Sources */ = {isa = PBXBuildFile; fileRef = 43D565640F1EC9A600550C88 /* hc128.c */; }; 43D565670F1EC9CC00550C88 /* rabbit.c in Sources */ = {isa = PBXBuildFile; fileRef = 43D565660F1EC9CC00550C88 /* rabbit.c */; }; - 43D565A40F29040000550C88 /* rabbit.h in Headers */ = {isa = PBXBuildFile; fileRef = 43D565A30F29040000550C88 /* rabbit.h */; }; - 43D565A60F29041C00550C88 /* hc128.h in Headers */ = {isa = PBXBuildFile; fileRef = 43D565A50F29041C00550C88 /* hc128.h */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -95,27 +92,14 @@ 43C6C28A0DDF98D400F2D488 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = hmac.c; path = ctaocrypt/src/hmac.c; sourceTree = ""; }; 43C6C28B0DDF98D400F2D488 /* integer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = integer.c; path = ctaocrypt/src/integer.c; sourceTree = ""; }; 43C6C28C0DDF98D400F2D488 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = md5.c; path = ctaocrypt/src/md5.c; sourceTree = ""; }; - 43C6C28D0DDF98D400F2D488 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = misc.c; path = ctaocrypt/src/misc.c; sourceTree = ""; }; 43C6C28E0DDF98D400F2D488 /* random.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = random.c; path = ctaocrypt/src/random.c; sourceTree = ""; }; 43C6C28F0DDF98D400F2D488 /* rsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = rsa.c; path = ctaocrypt/src/rsa.c; sourceTree = ""; }; 43C6C2900DDF98D400F2D488 /* sha.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = sha.c; path = ctaocrypt/src/sha.c; sourceTree = ""; }; 43C6C2910DDF98D400F2D488 /* sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = sha256.c; path = ctaocrypt/src/sha256.c; sourceTree = ""; }; 43CA25BA0EA400BE0011ECA2 /* cyassl_error.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = cyassl_error.h; path = include/cyassl_error.h; sourceTree = ""; }; 43CA25BB0EA400BE0011ECA2 /* cyassl_int.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = cyassl_int.h; path = include/cyassl_int.h; sourceTree = ""; }; - 43CA25BC0EA400DC0011ECA2 /* test.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = test.h; path = examples/test.h; sourceTree = ""; }; - 43CA25BE0EA4010C0011ECA2 /* arc4.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = arc4.h; path = ctaocrypt/include/arc4.h; sourceTree = ""; }; 43CA25C10EA4010C0011ECA2 /* mpi_superclass.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 0; name = mpi_superclass.h; path = ctaocrypt/include/mpi_superclass.h; sourceTree = ""; }; - 43CA25C20EA4010C0011ECA2 /* random.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = random.h; path = ctaocrypt/include/random.h; sourceTree = ""; }; - 43CA25C40EA4010C0011ECA2 /* sha256.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 0; name = sha256.h; path = ctaocrypt/include/sha256.h; sourceTree = ""; }; - 43CA25C50EA4010C0011ECA2 /* coding.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = coding.h; path = ctaocrypt/include/coding.h; sourceTree = ""; }; - 43CA25C60EA4010C0011ECA2 /* des3.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = des3.h; path = ctaocrypt/include/des3.h; sourceTree = ""; }; - 43CA25C70EA4010C0011ECA2 /* error.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = error.h; path = ctaocrypt/include/error.h; sourceTree = ""; }; - 43CA25C80EA4010C0011ECA2 /* misc.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = misc.h; path = ctaocrypt/include/misc.h; sourceTree = ""; }; - 43CA25C90EA4010C0011ECA2 /* integer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = integer.h; path = ctaocrypt/include/integer.h; sourceTree = ""; }; - 43CA25CA0EA4010C0011ECA2 /* tfm.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 0; name = tfm.h; path = ctaocrypt/include/tfm.h; sourceTree = ""; }; - 43CA25CB0EA4010C0011ECA2 /* asn.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = asn.h; path = ctaocrypt/include/asn.h; sourceTree = ""; }; 43CA25CD0EA4010C0011ECA2 /* mpi_class.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 0; name = mpi_class.h; path = ctaocrypt/include/mpi_class.h; sourceTree = ""; }; - 43CA25CE0EA4010C0011ECA2 /* types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = types.h; path = ctaocrypt/include/types.h; sourceTree = ""; }; 43CA25D10EA401550011ECA2 /* cyassl_callbacks.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = cyassl_callbacks.h; path = include/openssl/cyassl_callbacks.h; sourceTree = ""; }; 43CA25D20EA401550011ECA2 /* ssl.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; lineEnding = 2; name = ssl.h; path = include/openssl/ssl.h; sourceTree = ""; }; 43CA4B3612C14EAE0001AF79 /* ctc_hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = ctc_hmac.h; path = ctaocrypt/include/ctc_hmac.h; sourceTree = ""; }; @@ -130,8 +114,6 @@ 43CB530D116E9FD5000A264B /* iphone-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "iphone-Info.plist"; sourceTree = ""; }; 43D565640F1EC9A600550C88 /* hc128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = hc128.c; path = ctaocrypt/src/hc128.c; sourceTree = ""; }; 43D565660F1EC9CC00550C88 /* rabbit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = rabbit.c; path = ctaocrypt/src/rabbit.c; sourceTree = ""; }; - 43D565A30F29040000550C88 /* rabbit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = rabbit.h; path = ctaocrypt/include/rabbit.h; sourceTree = ""; }; - 43D565A50F29041C00550C88 /* hc128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = hc128.h; path = ctaocrypt/include/hc128.h; sourceTree = ""; }; D2AAC046055464E500DB518D /* libcyassl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcyassl.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -194,7 +176,6 @@ 43C6C28A0DDF98D400F2D488 /* hmac.c */, 43C6C28B0DDF98D400F2D488 /* integer.c */, 43C6C28C0DDF98D400F2D488 /* md5.c */, - 43C6C28D0DDF98D400F2D488 /* misc.c */, 43C6C28E0DDF98D400F2D488 /* random.c */, 43C6C28F0DDF98D400F2D488 /* rsa.c */, 43C6C2900DDF98D400F2D488 /* sha.c */, @@ -219,24 +200,10 @@ 43CA4B3C12C14EAE0001AF79 /* ctc_dsa.h */, 43CA4B3D12C14EAE0001AF79 /* ctc_dh.h */, 43CA4B3E12C14EAE0001AF79 /* ctc_aes.h */, - 43D565A50F29041C00550C88 /* hc128.h */, - 43D565A30F29040000550C88 /* rabbit.h */, 43CA25D10EA401550011ECA2 /* cyassl_callbacks.h */, 43CA25D20EA401550011ECA2 /* ssl.h */, - 43CA25BE0EA4010C0011ECA2 /* arc4.h */, 43CA25C10EA4010C0011ECA2 /* mpi_superclass.h */, - 43CA25C20EA4010C0011ECA2 /* random.h */, - 43CA25C40EA4010C0011ECA2 /* sha256.h */, - 43CA25C50EA4010C0011ECA2 /* coding.h */, - 43CA25C60EA4010C0011ECA2 /* des3.h */, - 43CA25C70EA4010C0011ECA2 /* error.h */, - 43CA25C80EA4010C0011ECA2 /* misc.h */, - 43CA25C90EA4010C0011ECA2 /* integer.h */, - 43CA25CA0EA4010C0011ECA2 /* tfm.h */, - 43CA25CB0EA4010C0011ECA2 /* asn.h */, 43CA25CD0EA4010C0011ECA2 /* mpi_class.h */, - 43CA25CE0EA4010C0011ECA2 /* types.h */, - 43CA25BC0EA400DC0011ECA2 /* test.h */, 43CA25BA0EA400BE0011ECA2 /* cyassl_error.h */, 43CA25BB0EA400BE0011ECA2 /* cyassl_int.h */, ); @@ -257,8 +224,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 43D565A40F29040000550C88 /* rabbit.h in Headers */, - 43D565A60F29041C00550C88 /* hc128.h in Headers */, 43CA4B3F12C14EAE0001AF79 /* ctc_hmac.h in Headers */, 43CA4B4012C14EAE0001AF79 /* ctc_sha.h in Headers */, 43CA4B4112C14EAE0001AF79 /* ctc_rsa.h in Headers */, @@ -339,7 +304,6 @@ 43C6C2990DDF98D400F2D488 /* hmac.c in Sources */, 43C6C29A0DDF98D400F2D488 /* integer.c in Sources */, 43C6C29B0DDF98D400F2D488 /* md5.c in Sources */, - 43C6C29C0DDF98D400F2D488 /* misc.c in Sources */, 43C6C29D0DDF98D400F2D488 /* random.c in Sources */, 43C6C29E0DDF98D400F2D488 /* rsa.c in Sources */, 43C6C29F0DDF98D400F2D488 /* sha.c in Sources */, diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 6465d71e5..472524121 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -39,7 +39,7 @@ #include "prefix_ssl.h" #endif -#define CYASSL_VERSION "2.0.0rc1b" +#define CYASSL_VERSION "2.0.0rc2" #ifdef _WIN32 /* wincrypt.h clashes */ diff --git a/src/include.am b/src/include.am index 4cc4782a0..440cc1653 100644 --- a/src/include.am +++ b/src/include.am @@ -20,7 +20,7 @@ src_libcyassl_la_LDFLAGS = -no-undefined -version-info ${CYASSL_LIBRARY_VERSION} src_libcyassl_la_CFLAGS = -DBUILDING_CYASSL EXTRA_DIST += include/*.h include/openssl/*.h include/*.rc \ ctaocrypt/include/*.h ctaocrypt/src/ctc_misc.c \ - ctaocrypt/src/ctc_asm.c \ ctaocrypt/src/*.i + ctaocrypt/src/ctc_asm.c ctaocrypt/src/*.i if BUILD_AESNI src_libcyassl_la_SOURCES += ctaocrypt/src/aes_asm.s