diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-26 22:20:07 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-26 22:20:07 +0000 |
| commit | 73d2257d978c7a201d6a914dc141ea1484d9aa6f (patch) | |
| tree | 6089f64e2f7f10883762c3a9faa90001a526abdc /crypto | |
| parent | 540e6c172e0e8456bda34bf71dd23e618d2eeb9d (diff) | |
| download | openssl-73d2257d978c7a201d6a914dc141ea1484d9aa6f.tar.gz | |
Remove NOPROTO-related macros.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/x_crl.c | 2 | ||||
| -rw-r--r-- | crypto/bn/bn_prime.c | 4 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 4 | ||||
| -rw-r--r-- | crypto/dh/dh_gen.c | 2 | ||||
| -rw-r--r-- | crypto/rsa/rsa_gen.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index 969134918b..794e7a0eb1 100644 --- a/crypto/asn1/x_crl.c +++ b/crypto/asn1/x_crl.c @@ -102,7 +102,7 @@ int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **pp) if (sk_num(a->revoked) != 0) qsort((char *)a->revoked->data,sk_num(a->revoked), - sizeof(X509_REVOKED *),(int (*)(P_CC_CC))X509_REVOKED_seq_cmp); + sizeof(X509_REVOKED *),(int (*)(const void *,const void *))X509_REVOKED_seq_cmp); if ((a->version != NULL) && ((l=ASN1_INTEGER_get(a->version)) != 0)) { M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER); diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index e39febe367..28610766d0 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -76,7 +76,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, static int probable_prime_dh_strong(BIGNUM *rnd, int bits, BIGNUM *add, BIGNUM *rem, BN_CTX *ctx); BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int strong, BIGNUM *add, - BIGNUM *rem, void (*callback)(P_I_I_P), char *cb_arg) + BIGNUM *rem, void (*callback)(int,int,char *), char *cb_arg) { BIGNUM *rnd=NULL; BIGNUM t; @@ -151,7 +151,7 @@ err: return(ret); } -int BN_is_prime(BIGNUM *a, int checks, void (*callback)(P_I_I_P), +int BN_is_prime(BIGNUM *a, int checks, void (*callback)(int,int,char *), BN_CTX *ctx_passed, char *cb_arg) { int i,j,c2=0,ret= -1; diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 2810d3b10b..2a008729fb 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -151,12 +151,12 @@ void CRYPTO_set_add_lock_callback(int (*func)(int *num,int mount,int type, add_lock_callback=func; } -unsigned long (*CRYPTO_get_id_callback(P_V))(P_V) +unsigned long (*CRYPTO_get_id_callback(void))(void) { return(id_callback); } -void CRYPTO_set_id_callback(func) unsigned long (*func)(P_V); +void CRYPTO_set_id_callback(unsigned long (*func)(void)) { id_callback=func; } diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index 32237e8b95..4d4aa69029 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -84,7 +84,7 @@ */ DH *DH_generate_parameters(int prime_len, int generator, - void (*callback)(P_I_I_P), char *cb_arg) + void (*callback)(int,int,char *), char *cb_arg) { BIGNUM *p=NULL,*t1,*t2; DH *ret=NULL; diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index f5d7ad2558..8f3279eee1 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -63,7 +63,7 @@ #include <openssl/rsa.h> RSA *RSA_generate_key(int bits, unsigned long e_value, - void (*callback)(P_I_I_P), char *cb_arg) + void (*callback)(int,int,char *), char *cb_arg) { RSA *rsa=NULL; BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL,*tmp; |