Ignore:
Timestamp:
2010-03-01T19:46:43+01:00 (6 years ago)
Author:
nbd
Message:

openssl: upgrade to 0.9.8m (patch by Peter Wagner)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/openssl/patches/200-ocf-20080917.patch

    r19368 r19939  
    117117--- a/config 
    118118+++ b/config 
    119 @@ -48,10 +48,10 @@ done 
    120   
    121  # First get uname entries that we use below 
    122   
    123 -MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" 
    124 -RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" 
    125 -SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown" 
    126 -VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" 
    127 +[ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown" 
    128 +[ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown" 
    129 +[ "$SYSTEM" ]  || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown" 
    130 +[ "$VERSION" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown" 
    131   
    132   
    133  # Now test for ISC and SCO, since it is has a braindamaged uname. 
    134 @@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ 
     119@@ -270,7 +270,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
    135120                echo "ppc-apple-darwin${VERSION}" 
    136121                ;; 
     
    141126        esac 
    142127        exit 0 
    143 @@ -401,9 +401,9 @@ exit 0 
    144   
    145  # figure out if gcc is available and if so we use it otherwise 
    146  # we fallback to whatever cc does on the system 
     128@@ -399,7 +399,8 @@ exit 0 
     129 # this is where the translation occurs into SSLeay terms 
     130 # --------------------------------------------------------------------------- 
     131  
    147132-GCCVER=`(gcc -dumpversion) 2>/dev/null` 
    148133+CC="${CC:-gcc}" 
    149134+GCCVER=`(${CC} -dumpversion) 2>/dev/null` 
    150135 if [ "$GCCVER" != "" ]; then 
    151 -  CC=gcc 
    152136   # then strip off whatever prefix egcs prepends the number with... 
    153137   # Hopefully, this will work for any future prefixes as well. 
    154    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'` 
    155 @@ -413,7 +413,7 @@ if [ "$GCCVER" != "" ]; then 
     138@@ -409,6 +410,8 @@ if [ "$GCCVER" != "" ]; then 
     139   # major and minor version numbers. 
    156140   # peak single digit before and after first dot, e.g. 2.95.1 gives 29 
    157141   GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` 
    158  else 
    159 -  CC=cc 
     142+else 
    160143+  CC="${CC:-cc}" 
    161144 fi 
     
    344327-static int lengths[SIZE_NUM]={16,64,256,1024,8*1024}; 
    345328+static int lengths[SIZE_NUM]={16,64,256,1024,2*1024,4*1024}; 
     329 #ifndef OPENSSL_NO_RSA 
    346330 static double rsa_results[RSA_NUM][2]; 
    347  static double dsa_results[DSA_NUM][2]; 
    348  #ifndef OPENSSL_NO_ECDSA 
     331 #endif 
    349332@@ -328,6 +328,79 @@ static SIGRETTYPE sig_done(int sig) 
    350333 #define START  0 
     
    468451                } 
    469452  
    470 -#ifdef HAVE_FORK 
     453-#ifndef NO_FORK 
    471454-       if(multi && do_multi(multi)) 
    472455-               goto show_res; 
     
    773756 static int get_cryptodev_digests(const int **cnids); 
    774757 static int cryptodev_usable_ciphers(const int **nids); 
    775 @@ -100,7 +112,7 @@ static int cryptodev_asym(struct crypt_k 
    776  static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, 
    777      const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 
    778  static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, 
    779 -    RSA *rsa); 
    780 +    RSA *rsa, BN_CTX *ctx); 
    781  static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx); 
    782  static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, 
    783      const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 
    784758@@ -130,9 +142,12 @@ static struct { 
    785759        int     ivmax; 
     
    12521226                break; 
    12531227        } 
    1254 @@ -625,7 +942,7 @@ static int 
    1255  bn2crparam(const BIGNUM *a, struct crparam *crp) 
    1256  { 
    1257         int i, j, k; 
    1258 -       ssize_t words, bytes, bits; 
    1259 +       ssize_t bytes, bits; 
    1260         u_char *b; 
    1261   
    1262         crp->crp_p = NULL; 
    12631228@@ -637,6 +954,7 @@ bn2crparam(const BIGNUM *a, struct crpar 
    12641229        b = malloc(bytes); 
     
    12781243                        free(kop->crk_param[i].crp_p); 
    12791244                kop->crk_param[i].crp_p = NULL; 
    1280 @@ -756,12 +1074,10 @@ err: 
    1281  } 
    1282   
    1283  static int 
    1284 -cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) 
    1285 +cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) 
    1286  { 
    1287         int r; 
    1288 -       BN_CTX *ctx; 
    1289 - 
    1290 -       ctx = BN_CTX_new(); 
    1291 +       ctx = BN_CTX_new(); /* not sure why we reallocate this. DM */ 
    1292         r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL); 
    1293         BN_CTX_free(ctx); 
    1294         return (r); 
    12951245--- a/crypto/engine/engine.h 
    12961246+++ b/crypto/engine/engine.h 
Note: See TracChangeset for help on using the changeset viewer.