diff options
author | Ben Laurie <ben@openssl.org> | 1999-04-23 15:01:15 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 1999-04-23 15:01:15 +0000 |
commit | 61f5b6f33807306d09bccbc2dcad474d1d04ca40 (patch) | |
tree | 1680fa648df5f730df11ec433a512a1fadf0facd /crypto/x509v3 | |
parent | 779cc0bca98e35830db455f34b986b86a2d2f822 (diff) |
Work with -pedantic!
Diffstat (limited to 'crypto/x509v3')
-rw-r--r-- | crypto/x509v3/Makefile.ssl | 58 | ||||
-rw-r--r-- | crypto/x509v3/v3_alt.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3_sxnet.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/v3_utl.c | 6 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 8 |
5 files changed, 52 insertions, 32 deletions
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index 4b4a11b757..8294b5e142 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -98,8 +98,8 @@ v3_akey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_akey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_akey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h v3_akey.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_akey.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h -v3_akey.o: x509v3.h +v3_akey.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_akey.o: ../opensslv.h x509v3.h v3_alt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_alt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_alt.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -110,7 +110,7 @@ v3_alt.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_alt.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_alt.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_alt.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_alt.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_alt.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_bcons.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_bcons.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h v3_bcons.o: ../../include/cast.h ../../include/conf.h ../../include/des.h @@ -122,7 +122,7 @@ v3_bcons.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_bcons.o: ../../include/ripemd.h ../../include/rsa.h v3_bcons.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h v3_bcons.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h -v3_bcons.o: ../crypto.h ../opensslv.h x509v3.h +v3_bcons.o: ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_bitst.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_bitst.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_bitst.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -133,7 +133,7 @@ v3_bitst.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_bitst.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_bitst.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_bitst.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_bitst.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_bitst.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_conf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_conf.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_conf.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -144,7 +144,7 @@ v3_conf.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_conf.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_conf.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_conf.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_conf.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_conf.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_cpols.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_cpols.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h v3_cpols.o: ../../include/cast.h ../../include/conf.h ../../include/des.h @@ -156,7 +156,19 @@ v3_cpols.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_cpols.o: ../../include/ripemd.h ../../include/rsa.h v3_cpols.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h v3_cpols.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h -v3_cpols.o: ../crypto.h ../opensslv.h x509v3.h +v3_cpols.o: ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h +v3_crld.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h +v3_crld.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h +v3_crld.o: ../../include/cast.h ../../include/conf.h ../../include/des.h +v3_crld.o: ../../include/dh.h ../../include/dsa.h ../../include/e_os.h +v3_crld.o: ../../include/err.h ../../include/evp.h ../../include/idea.h +v3_crld.o: ../../include/lhash.h ../../include/md2.h ../../include/md5.h +v3_crld.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h +v3_crld.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h +v3_crld.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +v3_crld.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +v3_crld.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_crld.o: ../opensslv.h x509v3.h v3_enum.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_enum.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_enum.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -166,8 +178,8 @@ v3_enum.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_enum.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_enum.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h v3_enum.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_enum.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h -v3_enum.o: x509v3.h +v3_enum.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_enum.o: ../opensslv.h x509v3.h v3_extku.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_extku.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_extku.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -178,7 +190,7 @@ v3_extku.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_extku.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_extku.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_extku.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_extku.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_extku.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_genn.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_genn.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h v3_genn.o: ../../include/cast.h ../../include/conf.h ../../include/des.h @@ -189,8 +201,8 @@ v3_genn.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_genn.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_genn.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h v3_genn.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_genn.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h -v3_genn.o: x509v3.h +v3_genn.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_genn.o: ../opensslv.h x509v3.h v3_ia5.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_ia5.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_ia5.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -201,7 +213,7 @@ v3_ia5.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_ia5.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_ia5.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_ia5.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_ia5.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_ia5.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_int.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_int.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_int.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -211,8 +223,8 @@ v3_int.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_int.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_int.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h v3_int.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_int.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h -v3_int.o: x509v3.h +v3_int.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_int.o: ../opensslv.h x509v3.h v3_lib.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_lib.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_lib.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -223,7 +235,7 @@ v3_lib.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_lib.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_lib.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_lib.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_lib.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_lib.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_pku.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_pku.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h v3_pku.o: ../../include/cast.h ../../include/des.h ../../include/dh.h @@ -234,7 +246,7 @@ v3_pku.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h v3_pku.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h v3_pku.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h v3_pku.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h -v3_pku.o: ../crypto.h ../opensslv.h x509v3.h +v3_pku.o: ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_prn.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_prn.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_prn.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -245,7 +257,7 @@ v3_prn.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_prn.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_prn.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_prn.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_prn.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_prn.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_skey.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_skey.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_skey.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -255,8 +267,8 @@ v3_skey.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_skey.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_skey.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h v3_skey.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_skey.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h -v3_skey.o: x509v3.h +v3_skey.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h +v3_skey.o: ../opensslv.h x509v3.h v3_sxnet.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h v3_sxnet.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h v3_sxnet.o: ../../include/cast.h ../../include/conf.h ../../include/des.h @@ -268,7 +280,7 @@ v3_sxnet.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h v3_sxnet.o: ../../include/ripemd.h ../../include/rsa.h v3_sxnet.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h v3_sxnet.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h -v3_sxnet.o: ../crypto.h ../opensslv.h x509v3.h +v3_sxnet.o: ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3_utl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_utl.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_utl.o: ../../include/conf.h ../../include/des.h ../../include/dh.h @@ -279,7 +291,7 @@ v3_utl.o: ../../include/objects.h ../../include/pkcs7.h ../../include/rc2.h v3_utl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h v3_utl.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h v3_utl.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h -v3_utl.o: ../cryptlib.h ../crypto.h ../opensslv.h x509v3.h +v3_utl.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h x509v3.h v3err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h v3err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h @@ -289,4 +301,4 @@ v3err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h v3err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h v3err.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h v3err.o: ../../include/x509.h ../../include/x509_vfy.h ../crypto.h -v3err.o: ../opensslv.h x509v3.h +v3err.o: ../opensslconf.h ../opensslv.h x509v3.h diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c index 3823339650..e1b768fdd2 100644 --- a/crypto/x509v3/v3_alt.c +++ b/crypto/x509v3/v3_alt.c @@ -127,15 +127,15 @@ STACK *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, break; case GEN_EMAIL: - X509V3_add_value("email",gen->d.ia5->data, &ret); + X509V3_add_value_uchar("email",gen->d.ia5->data, &ret); break; case GEN_DNS: - X509V3_add_value("DNS",gen->d.ia5->data, &ret); + X509V3_add_value_uchar("DNS",gen->d.ia5->data, &ret); break; case GEN_URI: - X509V3_add_value("URI",gen->d.ia5->data, &ret); + X509V3_add_value_uchar("URI",gen->d.ia5->data, &ret); break; case GEN_DIRNAME: diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509v3/v3_sxnet.c index 1e261c51c0..42705cbff4 100644 --- a/crypto/x509v3/v3_sxnet.c +++ b/crypto/x509v3/v3_sxnet.c @@ -238,7 +238,7 @@ static SXNET * sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, /* Add an id given the zone as an ASCII number */ -int SXNET_add_id_asc(SXNET **psx, char *zone, unsigned char *user, +int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen) { ASN1_INTEGER *izone = NULL; @@ -251,7 +251,7 @@ int SXNET_add_id_asc(SXNET **psx, char *zone, unsigned char *user, /* Add an id given the zone as an unsigned long */ -int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, unsigned char *user, +int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen) { ASN1_INTEGER *izone = NULL; @@ -269,7 +269,7 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, unsigned char *user, * free it up afterwards. */ -int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, unsigned char *user, +int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, int userlen) { SXNET *sx = NULL; diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c index 7c79728771..6234694f16 100644 --- a/crypto/x509v3/v3_utl.c +++ b/crypto/x509v3/v3_utl.c @@ -89,6 +89,12 @@ int X509V3_add_value(const char *name, const char *value, STACK **extlist) return 0; } +int X509V3_add_value_uchar(const char *name, const unsigned char *value, + STACK **extlist) + { + return X509V3_add_value(name,(const char *)value,extlist); + } + /* Free function for STACK of CONF_VALUE */ void X509V3_conf_free(CONF_VALUE *conf) diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index b823b36264..5b19ff4e5d 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -299,9 +299,9 @@ SXNETID *d2i_SXNETID(SXNETID **a, unsigned char **pp, long length); SXNETID *SXNETID_new(void); void SXNETID_free(SXNETID *a); -int SXNET_add_id_asc(SXNET **psx, char *zone, unsigned char *user, int userlen); -int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, unsigned char *user, int userlen); -int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, unsigned char *user, int userlen); +int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen); +int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user, int userlen); +int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user, int userlen); ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone); ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone); @@ -395,6 +395,8 @@ void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject, X509_REQ *req, X509_CRL *crl, int flags); int X509V3_add_value(const char *name, const char *value, STACK **extlist); +int X509V3_add_value_uchar(const char *name, const unsigned char *value, + STACK **extlist); int X509V3_add_value_bool(const char *name, int asn1_bool, STACK **extlist); int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint, STACK **extlist); char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint); |