Commit 397f7038 authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall -Wshadow 

-Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -Winline'' with EGCS 1.1.2+
parent 884e8ec6

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ 


 Changes between 0.9.2b and 0.9.3



  *) Fix various things to let OpenSSL even pass ``egcc -pipe -O2 -Wall

     -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes

     -Wmissing-declarations -Wnested-externs -Winline'' with EGCS 1.1.2+ 

     [Ralf S. Engelschall]



  *) Various fixes to the EVP and PKCS#7 code. It may now be able to

     handle PKCS#7 enveloped data properly.

     [Sebastian Akerman <sak@parallelconsulting.com>, modified by Steve]

apps/pkcs12.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ EVP_CIPHER *enc; 
#define CACERTS		0x10



int get_cert_chain(X509 *cert, STACK **chain);

int dump_cert_text (BIO *out, X509 *x);

int dump_certs_keys_p12(BIO *out, PKCS12 *p12, char *pass, int passlen, int options);

int dump_certs_pkeys_bags(BIO *out, STACK *bags, char *pass, int passlen, int options);

int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bags, char *pass, int passlen, int options);

crypto/rsa/rsa_oaep_test.c

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) 
  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \

  return (sizeof(ctext_ex) - 1);



int key1(RSA *key, unsigned char *c)

static int key1(RSA *key, unsigned char *c)

    {

    unsigned char n[] =

"\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
@@ -74,7 +74,7 @@ int key1(RSA *key, unsigned char *c) 
    SetKey;

    }



int key2(RSA *key, unsigned char *c)

static int key2(RSA *key, unsigned char *c)

    {

    unsigned char n[] =

"\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
@@ -119,7 +119,7 @@ int key2(RSA *key, unsigned char *c) 
    SetKey;

    }



int key3(RSA *key, unsigned char *c)

static int key3(RSA *key, unsigned char *c)

    {

    unsigned char n[] =

"\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
@@ -191,7 +191,7 @@ int key3(RSA *key, unsigned char *c) 
    SetKey;

    }



int pad_unknown(void)

static int pad_unknown(void)

{

    unsigned long l;

    while ((l = ERR_get_error()) != 0)

crypto/sha/sha_locl.h

+3 −3
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ 
			})

#ifndef I386_ONLY

#define Endian_Reverse32(a) \

			{ register unsigned int l=(a);	\

			{ register unsigned int ltmp=(a);	\

				asm ("bswapl %0"	\

				: "=r"(l) : "0"(l));	\

			  (a)=l;			\

				: "=r"(ltmp) : "0"(ltmp));	\

			  (a)=ltmp;			\

			}

#endif

#elif defined(__powerpc)

crypto/x509/x509.h

+3 −0
Original line number Diff line number Diff line
@@ -900,6 +900,9 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken); 


/* Password based encryption routines */



int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,

	     unsigned char *salt, int saltlen, int iter, EVP_CIPHER_CTX *ctx,

	     int en_de);

int EVP_PBE_ALGOR_CipherInit(X509_ALGOR *algor, const char *pass,

			     int passlen, EVP_CIPHER_CTX *ctx, int en_de);

int EVP_PBE_alg_add(int nid, EVP_CIPHER *cipher, EVP_MD *md,