diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/camellia/cmll_locl.h | 2 | ||||
-rw-r--r-- | crypto/pkcs12/p12_decr.c | 19 | ||||
-rw-r--r-- | crypto/pkcs12/pkcs12.h | 3 |
3 files changed, 14 insertions, 10 deletions
diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h index 6892a6232a..f7af06978c 100644 --- a/crypto/camellia/cmll_locl.h +++ b/crypto/camellia/cmll_locl.h @@ -79,7 +79,7 @@ typedef unsigned char u8; # endif # define GETU32(p) SWAP(*((u32 *)(p))) # define PUTU32(p,v) (*((u32 *)(p)) = SWAP((v))) -#elif defined(__GNUC__) && __GNUC__>=2 && (defined(__i386) || defined(__x86_64)) +#elif defined(__GNUC__) && __GNUC__>=2 && (defined(__i386) || defined(__x86_64)) && !defined(PEDANTIC) # if defined(B_ENDIAN) /* stratus.com does it */ # define GETU32(p) (*(u32 *)(p)) # define PUTU32(p,v) (*(u32 *)(p)=(v)) diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index 74c961a92b..93a8639cf3 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -69,8 +69,9 @@ */ unsigned char * PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, - int passlen, unsigned char *in, int inlen, unsigned char **data, - int *datalen, int en_de) + int passlen, unsigned char *in, int inlen, + unsigned char **data, size_t *datalen, + int en_de) { unsigned char *out; int outlen, i; @@ -111,12 +112,13 @@ unsigned char * PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, */ void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, - const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf) + const char *pass, int passlen, + ASN1_OCTET_STRING *oct, int zbuf) { unsigned char *out; const unsigned char *p; void *ret; - int outlen; + size_t outlen; if (!PKCS12_pbe_crypt(algor, pass, passlen, oct->data, oct->length, &out, &outlen, 0)) { @@ -147,9 +149,10 @@ void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, * if zbuf set zero encoding. */ -ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, - const char *pass, int passlen, - void *obj, int zbuf) +ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, + const ASN1_ITEM *it, + const char *pass, int passlen, + void *obj, int zbuf) { ASN1_OCTET_STRING *oct; unsigned char *in = NULL; @@ -164,7 +167,7 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *i return NULL; } if (!PKCS12_pbe_crypt(algor, pass, passlen, in, inlen, &oct->data, - &oct->length, 1)) { + &oct->length, 1)) { PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT,PKCS12_R_ENCRYPT_ERROR); OPENSSL_free(in); return NULL; diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index c84606dc93..a26a73c956 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -208,7 +208,8 @@ ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid); char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, int passlen, unsigned char *in, int inlen, - unsigned char **data, int *datalen, int en_de); + unsigned char **data, size_t *datalen, + int en_de); void * PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf); ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, |