diff options
author | Brian Carlstrom <bdc@google.com> | 2012-05-10 15:18:43 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2012-05-10 15:18:43 -0700 |
commit | eb16853f1084abf2770588727ef99c6a244abc50 (patch) | |
tree | b07b2bffc95a1c06ee883cce1131d2d24513e230 /crypto | |
parent | f42d491ab90c82302b0054c62014c1ee9b638aff (diff) | |
download | replicant_openssl-eb16853f1084abf2770588727ef99c6a244abc50.zip replicant_openssl-eb16853f1084abf2770588727ef99c6a244abc50.tar.gz replicant_openssl-eb16853f1084abf2770588727ef99c6a244abc50.tar.bz2 |
openssl-1.0.1c upgrade
Bug: 6478397
Change-Id: If231aadbeb92eba4383adf91969361102cdfad69
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/opensslv.h | 6 | ||||
-rwxr-xr-x | crypto/ppccpuid.pl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/opensslv.h b/crypto/opensslv.h index 9e86557..71be359 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000102fL +#define OPENSSL_VERSION_NUMBER 0x1000103fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1b-fips 26 Apr 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c-fips 10 May 2012" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1b 26 Apr 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c 10 May 2012" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/crypto/ppccpuid.pl b/crypto/ppccpuid.pl index 0677469..4ba736a 100755 --- a/crypto/ppccpuid.pl +++ b/crypto/ppccpuid.pl @@ -105,7 +105,7 @@ Ladd: lwarx r5,0,r3 Little: mtctr r4 stb r0,0(r3) addi r3,r3,1 - bdnz- \$-8 + bdnz \$-8 blr Lot: andi. r5,r3,3 beq Laligned @@ -118,7 +118,7 @@ Laligned: mtctr r5 stw r0,0(r3) addi r3,r3,4 - bdnz- \$-8 + bdnz \$-8 andi. r4,r4,3 bne Little blr |