Changeset c1dfc02 in freewrt

Timestamp:

Jul 6, 2007, 3:08:43 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

ae03d20

Parents:

cf8530d

Message:

• unify the opensslconf.h files by wish of wbx@ and tweak them a little for the specific architectures this is 32-bit only; 64-bit targets will fail
• fix a pointer-to-function conversion issue

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3158 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/openssl

Files:

• Makefile (modified) (1 diff)
• extra/bsd/libcrypto/Makefile (modified) (2 diffs)
• extra/bsd/libcrypto/arch/i386/opensslconf.h (deleted)
• extra/bsd/libcrypto/arch/mipsel/opensslconf.h (deleted)
• extra/bsd/libcrypto/opensslconf.h (moved) (moved from package/openssl/extra/bsd/libcrypto/arch/armeb/opensslconf.h ) (5 diffs)
• patches/patch-crypto_engine_eng_cryptodev_c (modified) (2 diffs)

package/openssl/Makefile

@@ -9 +9 @@
 PKG_NAME:=              openssl
 PKG_VERSION:=           0.9.8e
-PKG_RELEASE:=           8
+PKG_RELEASE:=           9
 PKG_MD5SUM:=            3a7ff24f6ea5cd711984722ad654b927
 

package/openssl/extra/bsd/libcrypto/Makefile

@@ -90 +90 @@
         ${LCRYPTO_SRC}/store ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/ui \
         ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/camellia \
-        ${LCRYPTO_SRC} ${.CURDIR}/arch/${MACHINE_ARCH} \
+        ${LCRYPTO_SRC} ${.CURDIR} \
         ${LCRYPTO_SRC}/bn/asm ${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/rc5
 
@@ -158 +158 @@
         ${.CURDIR}/fips.h \
         ${.CURDIR}/fips_rand.h \
-        ${.CURDIR}/arch/${MACHINE_ARCH}/opensslconf.h \
+        ${.CURDIR}/opensslconf.h \
         ${.OBJDIR}/obj_mac.h
 HDRSRC= ${SSL_SRC}

package/openssl/extra/bsd/libcrypto/opensslconf.h

@@ -1 @@
-/* XXX adjust for arm */
+/* tweaked manually; 32-bit platforms only */
+
 
 /* opensslconf.h */
@@ -62 +63 @@
  * - elder Alpha because it lacks byte load/store instructions;
  */
-#define RC4_INT unsigned char
+#define RC4_INT unsigned int
 #endif
 #if !defined(RC4_CHUNK)
@@ -102 +103 @@
 /* if this is defined data[i] is used instead of *data, this is a %20
  * speedup on x86 */
+#if defined(i386) || defined(__i386__)
+#define RC4_INDEX
+#else
 #undef RC4_INDEX
+#endif
 #endif
 
@@ -116 +121 @@
  * protected undef/define */
 #ifndef DES_PTR
-#undef DES_PTR
+#define DES_PTR
 #endif
 
@@ -123 +128 @@
  * registers */
 #ifndef DES_RISC1
+#if defined(i386) || defined(__i386__) || defined(__sparc__)
+#define DES_RISC1
+#else
 #undef DES_RISC1
+#endif
 #endif
 
 #ifndef DES_RISC2
+#if defined(i386) || defined(__i386__) || defined(__sparc__)
 #undef DES_RISC2
+#else
+#define DES_RISC2
+#endif
 #endif
 

package/openssl/patches/patch-crypto_engine_eng_cryptodev_c

@@ -1 +1 @@
 $FreeWRT$
 --- openssl-0.9.8e.orig/crypto/engine/eng_cryptodev.c   2004-06-15 13:45:42.000000000 +0200
-+++ openssl-0.9.8e/crypto/engine/eng_cryptodev.c        2007-07-05 16:51:54.000000000 +0200
++++ openssl-0.9.8e/crypto/engine/eng_cryptodev.c        2007-07-06 15:06:52.000000000 +0200
+@@ -100,7 +100,7 @@ static int cryptodev_asym(struct crypt_k
+ static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a,
+     const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+ static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,
+-    RSA *rsa);
++    RSA *rsa, BN_CTX *cti);
+ static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+ static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,
+     const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 @@ -133,6 +133,7 @@ static struct {
         { CRYPTO_DES_CBC,               NID_des_cbc,            8,       8, },
@@ -85 +94 @@
                 *cipher = NULL;
                 break;
+@@ -756,7 +776,7 @@ err:
+ }
+ 
+ static int
+-cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
++cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *cti)
+ {
+        int r;
+        BN_CTX *ctx;