Survive pedanticism.

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 405e7694944752126cce1e2491f7e3bb8964604e..f75e77b941eeeb7888e2244ce9994f0dcc87e83f 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -460,7 +460,7 @@ BIO *BIO_new_fp_internal(FILE *stream, int close_flag);
 #    define BIO_new_fp BIO_new_fp_internal
 #  else /* FP_API */
 BIO_METHOD *BIO_s_file(void );
-BIO *BIO_new_file(char *filename, char *mode);
+BIO *BIO_new_file(const char *filename, const char *mode);
 BIO *BIO_new_fp(FILE *stream, int close_flag);
 #    define BIO_s_file_internal                BIO_s_file
 #    define BIO_new_file_internal      BIO_new_file

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 4636665c8ce47031512e4c8085e19936342c4ca6..cae59170361646252c4e3fb06966d481f9ac9fdc 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -187,7 +187,8 @@ static int bio_puts(BIO *bio, char *str)
        return bio_write(bio, str, strlen(str));
        }
 
-
+/* Until bio_make_pair is used, make a dummy function use it for -pedantic */
+void dummy() { bio_make_pair(NULL,NULL); }
 
 static int bio_make_pair(BIO *bio1, BIO *bio2)
        {

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 232e63669c4e04dee1583b5ec4754a3aaacc8f73..52c0c39df045a0b303c33967fa43ae32b33527cc 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -93,7 +93,7 @@ static BIO_METHOD methods_filep=
        file_free,
        };
 
-BIO *BIO_new_file(char *filename, char *mode)
+BIO *BIO_new_file(const char *filename, const char *mode)
        {
        BIO *ret;
        FILE *file;

diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index affafd256bb1d206a26a5df33dfbf95e167ae6ac..2cc3797a94e30311b9f83d3eb2640f7862e6f9d0 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -105,8 +105,13 @@ typedef struct dh_st
                (unsigned char *)(x))
 #define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)())DH_new, \
                (char *(*)())d2i_DHparams,(bp),(unsigned char **)(x))
+#ifdef  __cplusplus
+#define i2d_DHparams_bio(bp,x) ASN1_i2d_bio((int (*)())i2d_DHparams,(bp), \
+               (unsigned char *)(x))
+#else
 #define i2d_DHparams_bio(bp,x) ASN1_i2d_bio(i2d_DHparams,(bp), \
                (unsigned char *)(x))
+#endif
 
 DH *   DH_new(void);
 void   DH_free(DH *dh);

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 28814c80736cd4744de49c289ef60a1039217592..e7b55a58858978b5ec6271f92b4edb91582c7f0e 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -641,8 +641,8 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,
                         int en_de);
 int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                               unsigned char *salt, int saltlen, int iter,
-                                        int keylen, unsigned char *out);
+                          unsigned char *salt, int saltlen, int iter,
+                          int keylen, unsigned char *out);
 int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                         ASN1_TYPE *param, EVP_CIPHER *cipher, EVP_MD *md,
                         int en_de);

diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 78fd0ef14d0447f1bedb7d55e18b765fbc037639..ef3f941a7e5f5c593ca38860a19ebad09ceca01e 100644 (file)
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -69,8 +69,8 @@
  */
 
 int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                               unsigned char *salt, int saltlen, int iter,
-                                        int keylen, unsigned char *out)
+                          unsigned char *salt, int saltlen, int iter,
+                          int keylen, unsigned char *out)
 {
        unsigned char digtmp[SHA_DIGEST_LENGTH], *p, itmp[4];
        int cplen, j, k;

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 0825536393195e2648e7f9841967c1ef106d4fb5..5c349bbb56e47c23375aa2fb23acc139ff359645 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -60,7 +60,7 @@
 #include <string.h>
 #include <openssl/hmac.h>
 
-void HMAC_Init(HMAC_CTX *ctx, const unsigned char *key, int len,
+void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
               const EVP_MD *md)
        {
        int i,j,reset=0;
@@ -133,8 +133,9 @@ void HMAC_cleanup(HMAC_CTX *ctx)
        memset(ctx,0,sizeof(HMAC_CTX));
        }
 
-unsigned char *HMAC(const EVP_MD *evp_md, const unsigned char *key, int key_len,
-            unsigned char *d, int n, unsigned char *md, unsigned int *md_len)
+unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
+                   unsigned char *d, int n, unsigned char *md,
+                   unsigned int *md_len)
        {
        HMAC_CTX c;
        static unsigned char m[EVP_MAX_MD_SIZE];

diff --git a/crypto/hmac/hmac.h b/crypto/hmac/hmac.h
index 57204985d32606cbb018518287e7234678f79d7a..f928975fcdc6cddc32ccdbebc1e71d20e7e04af2 100644 (file)
--- a/crypto/hmac/hmac.h
+++ b/crypto/hmac/hmac.h
@@ -83,13 +83,14 @@ typedef struct hmac_ctx_st
 #define HMAC_size(e)   (EVP_MD_size((e)->md))
 
 
-void HMAC_Init(HMAC_CTX *ctx, const unsigned char *key, int len,
+void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
               const EVP_MD *md);
 void HMAC_Update(HMAC_CTX *ctx,unsigned char *key, int len);
 void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
 void HMAC_cleanup(HMAC_CTX *ctx);
-unsigned char *HMAC(const EVP_MD *evp_md, const unsigned char *key, int key_len,
-       unsigned char *d, int n, unsigned char *md, unsigned int *md_len);
+unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
+                   unsigned char *d, int n, unsigned char *md,
+                   unsigned int *md_len);
 
 
 #ifdef  __cplusplus

diff --git a/demos/selfsign.c b/demos/selfsign.c
index 07711343a3e18958c9a3022f0478dcb89c8ad802..ea9b3ff1c8e8909a070903b4958fd241f4e65b1d 100644 (file)
--- a/demos/selfsign.c
+++ b/demos/selfsign.c
@@ -102,7 +102,7 @@ int days;
        else
                x= *x509p;
 
-       rsa=RSA_generate_key(bits,RSA_F4,callback);
+       rsa=RSA_generate_key(bits,RSA_F4,callback,NULL);
        if (!EVP_PKEY_assign_RSA(pk,rsa))
                {
                abort();