mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Bump wolfSSL to 5.6.3. Delete old recipes. (#9688)
This commit is contained in:
Juliusz Sosinowicz
committed by
GitHub
GitHub
parent
6397049067
commit
6c60f0a7d7
@@ -1,255 +0,0 @@
|
||||
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
|
||||
|
||||
+AC_CHECK_LIB(network,socket)
|
||||
+AC_CHECK_LIBM
|
||||
|
||||
# IPv6 Test Apps
|
||||
AC_ARG_ENABLE(ipv6,
|
||||
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)
|
||||
-#define mp_iseven(a) \
|
||||
- (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
|
||||
-#define mp_isodd(a) \
|
||||
- (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
|
||||
+#define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO)
|
||||
+#define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO)
|
||||
|
||||
|
||||
/* number of primes */
|
||||
@@ -208,8 +206,7 @@
|
||||
#define PRIME_SIZE 256
|
||||
#endif
|
||||
|
||||
-#define mp_prime_random(a, t, size, bbs, cb, dat) \
|
||||
- mp_prime_random_ex(a, t, ((size) * 8) + 1, (bbs==1)?LTM_PRIME_BBS:0, cb, dat)
|
||||
+#define mp_prime_random(a, t, size, bbs, cb, dat) mp_prime_random_ex(a, t, ((size) * 8) + 1, (bbs==1)?LTM_PRIME_BBS:0, cb, dat)
|
||||
|
||||
#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 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. */
|
||||
-#if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
|
||||
- defined(__mips64) || defined(__x86_64__))
|
||||
+#if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__mips64) || defined(__x86_64__))
|
||||
typedef word64 word;
|
||||
#else
|
||||
typedef word32 word;
|
||||
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*/
|
||||
-#define h1(ctx, x, y) { \
|
||||
- byte a,c; \
|
||||
- a = (byte) (x); \
|
||||
- c = (byte) ((x) >> 16); \
|
||||
- y = (ctx->T[512+a])+(ctx->T[512+256+c]); \
|
||||
-}
|
||||
+#define h1(ctx, x, y) { byte a,c; a = (byte) (x); c = (byte) ((x) >> 16); y = (ctx->T[512+a])+(ctx->T[512+256+c]);}
|
||||
|
||||
/*h2 function*/
|
||||
-#define h2(ctx, x, y) { \
|
||||
- byte a,c; \
|
||||
- a = (byte) (x); \
|
||||
- c = (byte) ((x) >> 16); \
|
||||
- y = (ctx->T[a])+(ctx->T[256+c]); \
|
||||
-}
|
||||
+#define h2(ctx, x, y) { byte a,c; a = (byte) (x); c = (byte) ((x) >> 16); y = (ctx->T[a])+(ctx->T[256+c]); }
|
||||
|
||||
/*one step of HC-128, update P and generate 32 bits keystream*/
|
||||
-#define step_P(ctx,u,v,a,b,c,d,n){ \
|
||||
- word32 tem0,tem1,tem2,tem3; \
|
||||
- h1((ctx),(ctx->X[(d)]),tem3); \
|
||||
- tem0 = rotrFixed((ctx->T[(v)]),23); \
|
||||
- tem1 = rotrFixed((ctx->X[(c)]),10); \
|
||||
- tem2 = rotrFixed((ctx->X[(b)]),8); \
|
||||
- (ctx->T[(u)]) += tem2+(tem0 ^ tem1); \
|
||||
- (ctx->X[(a)]) = (ctx->T[(u)]); \
|
||||
- (n) = tem3 ^ (ctx->T[(u)]) ; \
|
||||
-}
|
||||
+#define step_P(ctx,u,v,a,b,c,d,n){ word32 tem0,tem1,tem2,tem3; h1((ctx),(ctx->X[(d)]),tem3); tem0 = rotrFixed((ctx->T[(v)]),23); tem1 = rotrFixed((ctx->X[(c)]),10); tem2 = rotrFixed((ctx->X[(b)]),8); (ctx->T[(u)]) += tem2+(tem0 ^ tem1); (ctx->X[(a)]) = (ctx->T[(u)]); (n) = tem3 ^ (ctx->T[(u)]) ; }
|
||||
|
||||
/*one step of HC-128, update Q and generate 32 bits keystream*/
|
||||
-#define step_Q(ctx,u,v,a,b,c,d,n){ \
|
||||
- word32 tem0,tem1,tem2,tem3; \
|
||||
- h2((ctx),(ctx->Y[(d)]),tem3); \
|
||||
- tem0 = rotrFixed((ctx->T[(v)]),(32-23)); \
|
||||
- tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); \
|
||||
- tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); \
|
||||
- (ctx->T[(u)]) += tem2 + (tem0 ^ tem1); \
|
||||
- (ctx->Y[(a)]) = (ctx->T[(u)]); \
|
||||
- (n) = tem3 ^ (ctx->T[(u)]) ; \
|
||||
-}
|
||||
+#define step_Q(ctx,u,v,a,b,c,d,n){ word32 tem0,tem1,tem2,tem3; h2((ctx),(ctx->Y[(d)]),tem3); tem0 = rotrFixed((ctx->T[(v)]),(32-23)); tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); (ctx->T[(u)]) += tem2 + (tem0 ^ tem1); (ctx->Y[(a)]) = (ctx->T[(u)]); (n) = tem3 ^ (ctx->T[(u)]) ; }
|
||||
|
||||
/*16 steps of HC-128, generate 512 bits keystream*/
|
||||
static void generate_keystream(HC128* ctx, word32* keystream)
|
||||
@@ -128,26 +100,10 @@
|
||||
#define f2(x) (rotrFixed((x),17) ^ rotrFixed((x),19) ^ ((x) >> 10))
|
||||
|
||||
/*update table P*/
|
||||
-#define update_P(ctx,u,v,a,b,c,d){ \
|
||||
- word32 tem0,tem1,tem2,tem3; \
|
||||
- tem0 = rotrFixed((ctx->T[(v)]),23); \
|
||||
- tem1 = rotrFixed((ctx->X[(c)]),10); \
|
||||
- tem2 = rotrFixed((ctx->X[(b)]),8); \
|
||||
- h1((ctx),(ctx->X[(d)]),tem3); \
|
||||
- (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \
|
||||
- (ctx->X[(a)]) = (ctx->T[(u)]); \
|
||||
-}
|
||||
+#define update_P(ctx,u,v,a,b,c,d){ word32 tem0,tem1,tem2,tem3; tem0 = rotrFixed((ctx->T[(v)]),23); tem1 = rotrFixed((ctx->X[(c)]),10); tem2 = rotrFixed((ctx->X[(b)]),8); h1((ctx),(ctx->X[(d)]),tem3); (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; (ctx->X[(a)]) = (ctx->T[(u)]); }
|
||||
|
||||
/*update table Q*/
|
||||
-#define update_Q(ctx,u,v,a,b,c,d){ \
|
||||
- word32 tem0,tem1,tem2,tem3; \
|
||||
- tem0 = rotrFixed((ctx->T[(v)]),(32-23)); \
|
||||
- tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); \
|
||||
- tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); \
|
||||
- h2((ctx),(ctx->Y[(d)]),tem3); \
|
||||
- (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; \
|
||||
- (ctx->Y[(a)]) = (ctx->T[(u)]); \
|
||||
-}
|
||||
+#define update_Q(ctx,u,v,a,b,c,d){ word32 tem0,tem1,tem2,tem3; tem0 = rotrFixed((ctx->T[(v)]),(32-23)); tem1 = rotrFixed((ctx->Y[(c)]),(32-10)); tem2 = rotrFixed((ctx->Y[(b)]),(32-8)); h2((ctx),(ctx->Y[(d)]),tem3); (ctx->T[(u)]) = ((ctx->T[(u)]) + tem2+(tem0^tem1)) ^ tem3; (ctx->Y[(a)]) = (ctx->T[(u)]); }
|
||||
|
||||
/*16 steps of HC-128, without generating keystream, */
|
||||
/*but use the outputs to update P and Q*/
|
||||
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 */
|
||||
-#if defined(BN_MP_REDUCE_IS_2K_L_C) && defined(BN_MP_REDUCE_2K_L_C) && \
|
||||
- defined(BN_S_MP_EXPTMOD_C)
|
||||
+#if defined(BN_MP_REDUCE_IS_2K_L_C) && defined(BN_MP_REDUCE_2K_L_C) && defined(BN_S_MP_EXPTMOD_C)
|
||||
if (mp_reduce_is_2k_l(P) == MP_YES) {
|
||||
return s_mp_exptmod(G, X, P, Y, 1);
|
||||
}
|
||||
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
|
||||
-#define function(a,b,c,d,k,s) \
|
||||
- a=rotlFixed(a+G(b,c,d)+md4->buffer[k]+0x5a827999,s);
|
||||
+#define function(a,b,c,d,k,s) a=rotlFixed(a+G(b,c,d)+md4->buffer[k]+0x5a827999,s);
|
||||
|
||||
function(A,B,C,D, 0, 3);
|
||||
function(D,A,B,C, 4, 5);
|
||||
@@ -108,8 +107,7 @@
|
||||
function(B,C,D,A,15,13);
|
||||
|
||||
#undef function
|
||||
-#define function(a,b,c,d,k,s) \
|
||||
- a=rotlFixed(a+H(b,c,d)+md4->buffer[k]+0x6ed9eba1,s);
|
||||
+#define function(a,b,c,d,k,s) a=rotlFixed(a+H(b,c,d)+md4->buffer[k]+0x6ed9eba1,s);
|
||||
|
||||
function(A,B,C,D, 0, 3);
|
||||
function(D,A,B,C, 8, 9);
|
||||
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))
|
||||
|
||||
-#define MD5STEP(f, w, x, y, z, data, s) \
|
||||
- w = rotlFixed(w + f(x, y, z) + data, s) + x
|
||||
+#define MD5STEP(f, w, x, y, z, data, s) w = rotlFixed(w + f(x, y, z) + data, s) + x
|
||||
|
||||
/* Copy context->state[] to working vars */
|
||||
word32 a = md5->digest[0];
|
||||
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])
|
||||
-#define blk1(i) (W[i&15] = \
|
||||
- rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
|
||||
+#define blk1(i) (W[i&15] = rotlFixed(W[(i+13)&15]^W[(i+8)&15]^W[(i+2)&15]^W[i&15],1))
|
||||
|
||||
#define f1(x,y,z) (z^(x &(y^z)))
|
||||
#define f2(x,y,z) (x^y^z)
|
||||
@@ -63,16 +62,11 @@
|
||||
#define f4(x,y,z) (x^y^z)
|
||||
|
||||
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
|
||||
-#define R0(v,w,x,y,z,i) z+= f1(w,x,y) + blk0(i) + 0x5A827999+ \
|
||||
- rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
-#define R1(v,w,x,y,z,i) z+= f1(w,x,y) + blk1(i) + 0x5A827999+ \
|
||||
- rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
-#define R2(v,w,x,y,z,i) z+= f2(w,x,y) + blk1(i) + 0x6ED9EBA1+ \
|
||||
- rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
-#define R3(v,w,x,y,z,i) z+= f3(w,x,y) + blk1(i) + 0x8F1BBCDC+ \
|
||||
- rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
-#define R4(v,w,x,y,z,i) z+= f4(w,x,y) + blk1(i) + 0xCA62C1D6+ \
|
||||
- rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
+#define R0(v,w,x,y,z,i) z+= f1(w,x,y) + blk0(i) + 0x5A827999+ rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
+#define R1(v,w,x,y,z,i) z+= f1(w,x,y) + blk1(i) + 0x5A827999+ rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
+#define R2(v,w,x,y,z,i) z+= f2(w,x,y) + blk1(i) + 0x6ED9EBA1+ rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
+#define R3(v,w,x,y,z,i) z+= f3(w,x,y) + blk1(i) + 0x8F1BBCDC+ rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
+#define R4(v,w,x,y,z,i) z+= f4(w,x,y) + blk1(i) + 0xCA62C1D6+ rotlFixed(v,5); w = rotlFixed(w,30);
|
||||
|
||||
|
||||
static void Transform(Sha* sha)
|
||||
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 @@
|
||||
|
||||
|
||||
|
||||
-#if defined(BUILD_SSL_RSA_WITH_RC4_128_SHA) || \
|
||||
- defined(BUILD_SSL_RSA_WITH_RC4_128_MD5)
|
||||
+#if defined(BUILD_SSL_RSA_WITH_RC4_128_SHA) || defined(BUILD_SSL_RSA_WITH_RC4_128_MD5)
|
||||
#define BUILD_ARC4
|
||||
#endif
|
||||
|
||||
@@ -129,13 +128,11 @@
|
||||
#define BUILD_DES3
|
||||
#endif
|
||||
|
||||
-#if defined(BUILD_TLS_RSA_WITH_AES_128_CBC_SHA) || \
|
||||
- defined(BUILD_TLS_RSA_WITH_AES_256_CBC_SHA)
|
||||
+#if defined(BUILD_TLS_RSA_WITH_AES_128_CBC_SHA) || defined(BUILD_TLS_RSA_WITH_AES_256_CBC_SHA)
|
||||
#define BUILD_AES
|
||||
#endif
|
||||
|
||||
-#if defined(BUILD_TLS_RSA_WITH_HC_128_CBC_SHA) || \
|
||||
- defined(BUILD_TLS_RSA_WITH_HC_128_CBC_MD5)
|
||||
+#if defined(BUILD_TLS_RSA_WITH_HC_128_CBC_SHA) || defined(BUILD_TLS_RSA_WITH_HC_128_CBC_MD5)
|
||||
#define BUILD_HC128
|
||||
#endif
|
||||
|
||||
@@ -389,8 +386,7 @@
|
||||
The length (in bytes) of the following TLSPlaintext.fragment.
|
||||
The length should not exceed 2^14.
|
||||
*/
|
||||
-#define BUFFER16K_LEN RECORD_HEADER_SZ + MAX_RECORD_SIZE + \
|
||||
- MAX_COMP_EXTRA + MAX_MTU + MAX_MSG_EXTRA
|
||||
+#define BUFFER16K_LEN RECORD_HEADER_SZ + MAX_RECORD_SIZE + MAX_COMP_EXTRA + MAX_MTU + MAX_MSG_EXTRA
|
||||
typedef struct {
|
||||
word32 length;
|
||||
word32 idx;
|
||||
74
dev-libs/wolfssl/patches/wolfssl-5.6.3.patch
Normal file
74
dev-libs/wolfssl/patches/wolfssl-5.6.3.patch
Normal file
@@ -0,0 +1,74 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 26e7a75..cdc005a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8726,7 +8726,7 @@ echo "" >> $OPTION_FILE
|
||||
# check for supported command to trim option with
|
||||
if colrm >/dev/null 2>&1 </dev/null; then
|
||||
TRIM="colrm 3"
|
||||
-elif cut >/dev/null 2>&1 </dev/null; then
|
||||
+elif cut --version >/dev/null 2>&1 </dev/null; then
|
||||
TRIM="cut -c1-2"
|
||||
else
|
||||
AC_MSG_ERROR([Could not find colrm or cut to make options file])
|
||||
diff --git a/src/ssl.c b/src/ssl.c
|
||||
index fb8ee5c..fa20aef 100644
|
||||
--- a/src/ssl.c
|
||||
+++ b/src/ssl.c
|
||||
@@ -14404,7 +14404,7 @@ int wolfSSL_Cleanup(void)
|
||||
SessionCache[i].lock_valid = 0;
|
||||
}
|
||||
#else
|
||||
- if ((session_lock_valid == 1) && (wc_UnLockRwLock(&session_lock) != 0)) {
|
||||
+ if ((session_lock_valid == 1) && (wc_FreeRwLock(&session_lock) != 0)) {
|
||||
if (ret == WOLFSSL_SUCCESS)
|
||||
ret = BAD_MUTEX_E;
|
||||
}
|
||||
diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c
|
||||
index f80c9c6..9d2aa86 100644
|
||||
--- a/wolfcrypt/src/misc.c
|
||||
+++ b/wolfcrypt/src/misc.c
|
||||
@@ -397,11 +397,13 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
|
||||
#if defined(HAVE_FIPS) && !defined(min) /* so ifdef check passes */
|
||||
#define min min
|
||||
#endif
|
||||
+ #if defined(HAVE_FIPS) || !defined(min)
|
||||
/* returns the smaller of a and b */
|
||||
WC_MISC_STATIC WC_INLINE word32 min(word32 a, word32 b)
|
||||
{
|
||||
return a > b ? b : a;
|
||||
}
|
||||
+ #endif
|
||||
#endif /* !WOLFSSL_HAVE_MIN */
|
||||
|
||||
#ifndef WOLFSSL_HAVE_MAX
|
||||
@@ -409,10 +411,12 @@ WC_MISC_STATIC WC_INLINE int ConstantCompare(const byte* a, const byte* b,
|
||||
#if defined(HAVE_FIPS) && !defined(max) /* so ifdef check passes */
|
||||
#define max max
|
||||
#endif
|
||||
+ #if defined(HAVE_FIPS) || !defined(max)
|
||||
WC_MISC_STATIC WC_INLINE word32 max(word32 a, word32 b)
|
||||
{
|
||||
return a > b ? a : b;
|
||||
}
|
||||
+ #endif
|
||||
#endif /* !WOLFSSL_HAVE_MAX */
|
||||
|
||||
#ifndef WOLFSSL_NO_INT_ENCODE
|
||||
diff --git a/wolfssl/test.h b/wolfssl/test.h
|
||||
index fff6363..8bdbafc 100644
|
||||
--- a/wolfssl/test.h
|
||||
+++ b/wolfssl/test.h
|
||||
@@ -235,10 +235,12 @@
|
||||
#ifdef NO_INLINE
|
||||
#define min no_inline_min
|
||||
#endif
|
||||
+ #if defined(NO_INLINE) || !defined(min)
|
||||
static WC_INLINE word32 min(word32 a, word32 b)
|
||||
{
|
||||
return a > b ? b : a;
|
||||
}
|
||||
+ #endif
|
||||
#endif /* WOLFSSL_HAVE_MIN */
|
||||
|
||||
/* Socket Handling */
|
||||
@@ -1,61 +0,0 @@
|
||||
SUMMARY="An embedded SSL implementation"
|
||||
DESCRIPTION="A lightweight yet fully functional embedded SSL implementation."
|
||||
HOMEPAGE="http://yassl.com"
|
||||
COPYRIGHT="2006-2013 Sawtooth Consulting Ltd."
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://yassl.com/cyassl-2.8.0.zip"
|
||||
CHECKSUM_SHA256="94dcac2dfa87b8474815241eee50f7192e7f315c8173ec209d2a3f752bba9a8d"
|
||||
SOURCE_DIR="cyassl-$portVersion"
|
||||
|
||||
ARCHITECTURES="?all"
|
||||
SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
|
||||
|
||||
PROVIDES="
|
||||
cyassl$secondaryArchSuffix = $portVersion
|
||||
lib:libcyassl$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:dos2unix
|
||||
"
|
||||
|
||||
# DEPEND="app-text/dos2unix >= 1.0"
|
||||
BUILD()
|
||||
{
|
||||
dos2unix *
|
||||
dos2unix include/*
|
||||
dos2unix ctaocrypt/include/*
|
||||
dos2unix ctaocrypt/src/*
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
chmod 755 configure
|
||||
automake
|
||||
runConfigure ./configure --enable-shared
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
cd testsuite
|
||||
testsuite
|
||||
}
|
||||
@@ -4,11 +4,12 @@ lightweight SSL/TLS library written in ANSI C and targeted for embedded, \
|
||||
RTOS, and resource-constrained environments - primarily because of its \
|
||||
small size, speed, and feature set."
|
||||
HOMEPAGE="https://www.wolfssl.com/"
|
||||
COPYRIGHT="2006-2018 Sawtooth Consulting Ltd."
|
||||
COPYRIGHT="2006-2023 wolfSSL Inc."
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/wolfSSL/wolfssl/archive/v$portVersion-stable.tar.gz"
|
||||
CHECKSUM_SHA256="2b98d9ddac2a3188210de720051bed58f91910ee028a4b0a6dd6fd3c9ddb6fec"
|
||||
CHECKSUM_SHA256="2e74a397fa797c2902d7467d500de904907666afb4ff80f6464f6efd5afb114a"
|
||||
PATCHES="wolfssl-$portVersion.patch"
|
||||
SOURCE_FILENAME="wolfssl-$portVersion.tar.gz"
|
||||
SOURCE_DIR="wolfssl-$portVersion-stable"
|
||||
|
||||
@@ -22,7 +23,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
libVersion="18.0.0"
|
||||
libVersion="35.5.1"
|
||||
libVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -60,6 +61,7 @@ defineDebugInfoPackage wolfssl$secondaryArchSuffix \
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -vfi
|
||||
#export CPPFLAGS="-DWOLFSSL_HAVE_MIN -DWOLFSSL_HAVE_MAX"
|
||||
runConfigure --omit-dirs binDir ./configure \
|
||||
--bindir="$commandBinDir" \
|
||||
--enable-shared
|
||||
@@ -82,6 +84,4 @@ INSTALL()
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
#cd testsuite
|
||||
#testsuite
|
||||
}
|
||||
Reference in New Issue
Block a user