haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from dash102/master

Browse Source 
Renamed/Moved dev-libs/cyassl to dev-libs/wolfssl
This commit is contained in:
Adrien Destugues
2016-01-17 16:44:24 +01:00
parent d1ab88c163 296d4f1c5e
commit 8336e90629
6 changed files with 127 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
dev-libs/cyassl/patches/cyassl-1.6.5.patch → dev-libs/wolfssl/patches/wolfssl-1.6.5.patch
View File

@@ -1,7 +1,7 @@
diff -urN cyassl-1.6.5/configure.in cyassl-1.6.5-haiku/configure.in
--- cyassl-1.6.5/configure.in 2010-09-09 18:33:56.031195136 +0000
+++ cyassl-1.6.5-haiku/configure.in 2010-12-17 11:54:47.000000000 +0000
@@ -99,6 +99,8 @@
diff -urN wolfssl-1.6.5/configure.in wolfssl-1.6.5-haiku/configure.in
--- wolfssl-1.6.5/configure.in 2010-09-09 18:33:56.031195136 +0000
+++ wolfssl-1.6.5-haiku/configure.in 2010-12-17 11:54:47.000000000 +0000
@@ -99,6 +99,8 @@
CFLAGS="-DOPENSSL_EXTRA $CFLAGS"
fi
@@ -10,10 +10,10 @@ diff -urN cyassl-1.6.5/configure.in cyassl-1.6.5-haiku/configure.in
# IPv6 Test Apps
AC_ARG_ENABLE(ipv6,
diff -urN cyassl-1.6.5/ctaocrypt/include/integer.h cyassl-1.6.5-haiku/ctaocrypt/include/integer.h
--- cyassl-1.6.5/ctaocrypt/include/integer.h 2010-08-06 22:11:46.057147392 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/include/integer.h 2010-12-17 09:50:41.000000000 +0000
@@ -195,10 +195,8 @@
diff -urN wolfssl-1.6.5/ctaocrypt/include/integer.h wolfssl-1.6.5-haiku/ctaocrypt/include/integer.h
--- wolfssl-1.6.5/ctaocrypt/include/integer.h 2010-08-06 22:11:46.057147392 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/include/integer.h 2010-12-17 09:50:41.000000000 +0000
@@ -195,10 +195,8 @@
/* ---> Basic Manipulations <--- */
#define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO)
@@ -26,7 +26,7 @@ diff -urN cyassl-1.6.5/ctaocrypt/include/integer.h cyassl-1.6.5-haiku/ctaocrypt/
/* number of primes */
@@ -208,8 +206,7 @@
@@ -208,8 +206,7 @@
#define PRIME_SIZE 256
#endif
@@ -36,10 +36,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/include/integer.h cyassl-1.6.5-haiku/ctaocrypt/
#define mp_read_raw(mp, str, len) mp_read_signed_bin((mp), (str), (len))
#define mp_raw_size(mp) mp_signed_bin_size(mp)
diff -urN cyassl-1.6.5/ctaocrypt/include/types.h cyassl-1.6.5-haiku/ctaocrypt/include/types.h
--- cyassl-1.6.5/ctaocrypt/include/types.h 2010-08-25 21:07:45.058458112 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/include/types.h 2010-12-17 09:44:48.000000000 +0000
@@ -76,8 +76,7 @@
diff -urN wolfssl-1.6.5/ctaocrypt/include/types.h wolfssl-1.6.5-haiku/ctaocrypt/include/types.h
--- wolfssl-1.6.5/ctaocrypt/include/types.h 2010-08-25 21:07:45.058458112 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/include/types.h 2010-12-17 09:44:48.000000000 +0000
@@ -76,8 +76,7 @@
/* These platforms have 64-bit CPU registers. */
@@ -49,10 +49,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/include/types.h cyassl-1.6.5-haiku/ctaocrypt/in
typedef word64 word;
#else
typedef word32 word;
diff -urN cyassl-1.6.5/ctaocrypt/src/hc128.c cyassl-1.6.5-haiku/ctaocrypt/src/hc128.c
--- cyassl-1.6.5/ctaocrypt/src/hc128.c 2009-03-12 18:29:21.062914560 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/src/hc128.c 2010-12-17 10:10:13.000000000 +0000
@@ -34,44 +34,16 @@
diff -urN wolfssl-1.6.5/ctaocrypt/src/hc128.c wolfssl-1.6.5-haiku/ctaocrypt/src/hc128.c
--- wolfssl-1.6.5/ctaocrypt/src/hc128.c 2009-03-12 18:29:21.062914560 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/src/hc128.c 2010-12-17 10:10:13.000000000 +0000
@@ -34,44 +34,16 @@
/*h1 function*/
@@ -101,7 +101,7 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/hc128.c cyassl-1.6.5-haiku/ctaocrypt/src/hc
/*16 steps of HC-128, generate 512 bits keystream*/
static void generate_keystream(HC128* ctx, word32* keystream)
@@ -128,26 +100,10 @@
@@ -128,26 +100,10 @@
#define f2(x) (rotrFixed((x),17) ^ rotrFixed((x),19) ^ ((x) >> 10))
/*update table P*/
@@ -130,10 +130,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/hc128.c cyassl-1.6.5-haiku/ctaocrypt/src/hc
/*16 steps of HC-128, without generating keystream, */
/*but use the outputs to update P and Q*/
diff -urN cyassl-1.6.5/ctaocrypt/src/integer.c cyassl-1.6.5-haiku/ctaocrypt/src/integer.c
--- cyassl-1.6.5/ctaocrypt/src/integer.c 2010-08-10 00:04:37.063176704 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/src/integer.c 2010-12-17 10:30:49.571211776 +0000
@@ -718,8 +718,7 @@
diff -urN wolfssl-1.6.5/ctaocrypt/src/integer.c wolfssl-1.6.5-haiku/ctaocrypt/src/integer.c
--- wolfssl-1.6.5/ctaocrypt/src/integer.c 2010-08-10 00:04:37.063176704 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/src/integer.c 2010-12-17 10:30:49.571211776 +0000
@@ -718,8 +718,7 @@
}
/* modified diminished radix reduction */
@@ -143,10 +143,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/integer.c cyassl-1.6.5-haiku/ctaocrypt/src/
if (mp_reduce_is_2k_l(P) == MP_YES) {
return s_mp_exptmod(G, X, P, Y, 1);
}
diff -urN cyassl-1.6.5/ctaocrypt/src/md4.c cyassl-1.6.5-haiku/ctaocrypt/src/md4.c
--- cyassl-1.6.5/ctaocrypt/src/md4.c 2010-08-24 21:13:27.063438848 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/src/md4.c 2010-12-17 09:55:29.000000000 +0000
@@ -87,8 +87,7 @@
diff -urN wolfssl-1.6.5/ctaocrypt/src/md4.c wolfssl-1.6.5-haiku/ctaocrypt/src/md4.c
--- wolfssl-1.6.5/ctaocrypt/src/md4.c 2010-08-24 21:13:27.063438848 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/src/md4.c 2010-12-17 09:55:29.000000000 +0000
@@ -87,8 +87,7 @@
function(B,C,D,A,15,19);
#undef function
@@ -156,7 +156,7 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/md4.c cyassl-1.6.5-haiku/ctaocrypt/src/md4.
function(A,B,C,D, 0, 3);
function(D,A,B,C, 4, 5);
@@ -108,8 +107,7 @@
@@ -108,8 +107,7 @@
function(B,C,D,A,15,13);
#undef function
@@ -166,10 +166,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/md4.c cyassl-1.6.5-haiku/ctaocrypt/src/md4.
function(A,B,C,D, 0, 3);
function(D,A,B,C, 8, 9);
diff -urN cyassl-1.6.5/ctaocrypt/src/md5.c cyassl-1.6.5-haiku/ctaocrypt/src/md5.c
--- cyassl-1.6.5/ctaocrypt/src/md5.c 2010-08-24 21:13:58.063438848 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/src/md5.c 2010-12-17 09:54:20.000000000 +0000
@@ -61,8 +61,7 @@
diff -urN wolfssl-1.6.5/ctaocrypt/src/md5.c wolfssl-1.6.5-haiku/ctaocrypt/src/md5.c
--- wolfssl-1.6.5/ctaocrypt/src/md5.c 2010-08-24 21:13:58.063438848 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/src/md5.c 2010-12-17 09:54:20.000000000 +0000
@@ -61,8 +61,7 @@
#define F3(x, y, z) (x ^ y ^ z)
#define F4(x, y, z) (y ^ (x | ~z))
@@ -179,10 +179,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/md5.c cyassl-1.6.5-haiku/ctaocrypt/src/md5.
/* Copy context->state[] to working vars */
word32 a = md5->digest[0];
diff -urN cyassl-1.6.5/ctaocrypt/src/sha.c cyassl-1.6.5-haiku/ctaocrypt/src/sha.c
--- cyassl-1.6.5/ctaocrypt/src/sha.c 2010-08-24 21:14:07.064225280 +0000
+++ cyassl-1.6.5-haiku/ctaocrypt/src/sha.c 2010-12-17 09:56:55.000000000 +0000
@@ -54,8 +54,7 @@
diff -urN wolfssl-1.6.5/ctaocrypt/src/sha.c wolfssl-1.6.5-haiku/ctaocrypt/src/sha.c
--- wolfssl-1.6.5/ctaocrypt/src/sha.c 2010-08-24 21:14:07.064225280 +0000
+++ wolfssl-1.6.5-haiku/ctaocrypt/src/sha.c 2010-12-17 09:56:55.000000000 +0000
@@ -54,8 +54,7 @@
}
#define blk0(i) (W[i] = sha->buffer[i])
@@ -192,7 +192,7 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/sha.c cyassl-1.6.5-haiku/ctaocrypt/src/sha.
#define f1(x,y,z) (z^(x &(y^z)))
#define f2(x,y,z) (x^y^z)
@@ -63,16 +62,11 @@
@@ -63,16 +62,11 @@
#define f4(x,y,z) (x^y^z)
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
@@ -214,10 +214,10 @@ diff -urN cyassl-1.6.5/ctaocrypt/src/sha.c cyassl-1.6.5-haiku/ctaocrypt/src/sha.
static void Transform(Sha* sha)
diff -urN cyassl-1.6.5/include/cyassl_int.h cyassl-1.6.5-haiku/include/cyassl_int.h
--- cyassl-1.6.5/include/cyassl_int.h 2010-07-30 19:36:45.002621440 +0000
+++ cyassl-1.6.5-haiku/include/cyassl_int.h 2010-12-17 09:52:55.000000000 +0000
@@ -120,8 +120,7 @@
diff -urN wolfssl-1.6.5/include/wolfssl_int.h wolfssl-1.6.5-haiku/include/wolfssl_int.h
--- wolfssl-1.6.5/include/wolfssl_int.h 2010-07-30 19:36:45.002621440 +0000
+++ wolfssl-1.6.5-haiku/include/wolfssl_int.h 2010-12-17 09:52:55.000000000 +0000
@@ -120,8 +120,7 @@
@@ -227,7 +227,7 @@ diff -urN cyassl-1.6.5/include/cyassl_int.h cyassl-1.6.5-haiku/include/cyassl_in
#define BUILD_ARC4
#endif
@@ -129,13 +128,11 @@
@@ -129,13 +128,11 @@
#define BUILD_DES3
#endif
@@ -243,7 +243,7 @@ diff -urN cyassl-1.6.5/include/cyassl_int.h cyassl-1.6.5-haiku/include/cyassl_in
#define BUILD_HC128
#endif
@@ -389,8 +386,7 @@
@@ -389,8 +386,7 @@
The length (in bytes) of the following TLSPlaintext.fragment.
The length should not exceed 2^14.
*/

29
dev-libs/cyassl/cyassl-1.6.5.recipe → dev-libs/wolfssl/wolfssl-1.6.5.recipe
View File

@@ -1,13 +1,29 @@
SUMMARY="Lightweight yet fully functional embedded SSL implementation"
DESCRIPTION="lightweight yet fully functional embedded SSL implementation"
HOMEPAGE="http://yassl.com"
SOURCE_URI="http://yassl.com/cyassl-1.6.5.tar.gz"
COPYRIGHT="2006-2010 Sawtooth Consulting Ltd."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://yassl.com/cyassl-1.6.5.tar.gz"
CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903"
STATUS_HAIKU="stable"
DEPEND=""
CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903"
SOURCE_DIR="cyassl-$portVersion"
ARCHITECTURES=""
PROVIDES=""
REQUIRES=""
PROVIDES_devel=""
REQUIRES_devel=""
BUILD_REQUIRES=""
BUILD_PREREQUIRES=""
BUILD()
{
cd cyassl-1.6.5
cd wolfssl-1.6.5
libtoolize --force --copy --install
rm acinclude.m4
rm aclocal.m4
@@ -21,17 +37,14 @@ BUILD()
INSTALL()
{
cd cyassl-1.6.5
cd wolfssl-1.6.5
make install
}
TEST()
{
cd cyassl-1.6.5
cd wolfssl-1.6.5
make check
cd testsuite
testsuite
}
LICENSE="GNU GPL v2"
COPYRIGHT="2006-2010 Sawtooth Consulting Ltd."

29
dev-libs/cyassl/cyassl-1.8.0.recipe → dev-libs/wolfssl/wolfssl-1.8.0.recipe
View File

@@ -1,13 +1,29 @@
SUMMARY="Lightweight yet fully functional embedded SSL implementation"
DESCRIPTION="lightweight yet fully functional embedded SSL implementation"
HOMEPAGE="http://yassl.com"
SOURCE_URI="http://yassl.com/cyassl-1.8.0.zip"
COPYRIGHT="2006-2011 Sawtooth Consulting Ltd."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://yassl.com/cyassl-1.8.0.zip"
CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58"
STATUS_HAIKU="stable"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58"
SOURCE_DIR="cyassl-$portVersion"
ARCHITECTURES=""
PROVIDES=""
REQUIRES=""
PROVIDES_devel=""
REQUIRES_devel=""
BUILD_REQUIRES=""
BUILD_PREREQUIRES=""
BUILD()
{
cd cyassl-1.8.0
cd wolfssl-1.8.0
dos2unix *
dos2unix include/*
dos2unix ctaocrypt/include/*
@@ -25,17 +41,14 @@ BUILD()
INSTALL()
{
cd cyassl-1.8.0
cd wolfssl-1.8.0
make install
}
TEST()
{
cd cyassl-1.8.0
cd wolfssl-1.8.0
make check
cd testsuite
testsuite
}
LICENSE="GNU GPL v2"
COPYRIGHT="2006-2011 Sawtooth Consulting Ltd."

29
dev-libs/cyassl/cyassl-2.0.2.recipe → dev-libs/wolfssl/wolfssl-2.0.2.recipe
View File

@@ -1,13 +1,29 @@
SUMMARY="Lightweight yet fully functional embedded SSL implementation"
DESCRIPTION="lightweight yet fully functional embedded SSL implementation"
HOMEPAGE="http://yassl.com"
SOURCE_URI="http://yassl.com/cyassl-2.0.2.zip"
COPYRIGHT="2006-2011 Sawtooth Consulting Ltd."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://yassl.com/cyassl-2.0.2.zip"
CHECKSUM_MD5="2f51752207132c161155508eeb517e38"
STATUS_HAIKU="stable"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="2f51752207132c161155508eeb517e38"
SOURCE_DIR="cyassl-$portVersion"
ARCHITECTURES=""
PROVIDES=""
REQUIRES=""
PROVIDES_devel=""
REQUIRES_devel=""
BUILD_REQUIRES=""
BUILD_PREREQUIRES=""
BUILD()
{
cd cyassl-2.0.2
cd wolfssl-2.0.2
dos2unix *
dos2unix include/*
dos2unix ctaocrypt/include/*
@@ -23,17 +39,14 @@ BUILD()
INSTALL()
{
cd cyassl-2.0.2
cd wolfssl-2.0.2
make install
}
TEST()
{
cd cyassl-2.0.2
cd wolfssl-2.0.2
make check
cd testsuite
testsuite
}
LICENSE="GNU GPL v2"
COPYRIGHT="2006-2011 Sawtooth Consulting Ltd."

29
dev-libs/cyassl/cyassl-2.5.0.recipe → dev-libs/wolfssl/wolfssl-2.5.0.recipe
View File

@@ -1,13 +1,29 @@
SUMMARY="Lightweight yet fully functional embedded SSL implementation"
DESCRIPTION="lightweight yet fully functional embedded SSL implementation"
HOMEPAGE="http://yassl.com"
SOURCE_URI="http://yassl.com/cyassl-2.5.0.zip"
COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://yassl.com/cyassl-2.5.0.zip"
CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd"
STATUS_HAIKU="broken"
DEPEND="app-text/dos2unix >= 1.0"
CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd"
SOURCE_DIR="cyassl-$portVersion"
ARCHITECTURES=""
PROVIDES=""
REQUIRES=""
PROVIDES_devel=""
REQUIRES_devel=""
BUILD_REQUIRES=""
BUILD_PREREQUIRES=""
BUILD()
{
cd cyassl-2.5.0
cd wolfssl-2.5.0
dos2unix *
dos2unix include/*
dos2unix ctaocrypt/include/*
@@ -23,17 +39,14 @@ BUILD()
INSTALL()
{
cd cyassl-2.5.0
cd wolfssl-2.5.0
make install
}
TEST()
{
cd cyassl-2.5.0
cd wolfssl-2.5.0
make check
cd testsuite
testsuite
}
LICENSE="GNU GPL v2"
COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."

1
dev-libs/cyassl/cyassl-2.8.0.recipe → dev-libs/wolfssl/wolfssl-2.8.0.recipe
View File

@@ -6,6 +6,7 @@ LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://yassl.com/cyassl-2.8.0.zip"
CHECKSUM_SHA256="94dcac2dfa87b8474815241eee50f7192e7f315c8173ec209d2a3f752bba9a8d"
SOURCE_DIR="cyassl-$portVersion"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"