diff options
author | Ben Laurie <ben@openssl.org> | 1999-04-12 17:23:57 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 1999-04-12 17:23:57 +0000 |
commit | f73e07cf420ddad22b6148d8cbe28daf84ccae2d (patch) | |
tree | 3396fc9a31ba5a227211ea9e94600ddc4b4a58f2 /crypto/x509 | |
parent | a36a1a5146df87700eb8d3c7091cbd7106c958cf (diff) | |
download | openssl-f73e07cf420ddad22b6148d8cbe28daf84ccae2d.zip openssl-f73e07cf420ddad22b6148d8cbe28daf84ccae2d.tar.gz openssl-f73e07cf420ddad22b6148d8cbe28daf84ccae2d.tar.bz2 |
Add type-safe STACKs and SETs.
Diffstat (limited to 'crypto/x509')
-rw-r--r-- | crypto/x509/Makefile.ssl | 119 | ||||
-rw-r--r-- | crypto/x509/x509.h | 12 | ||||
-rw-r--r-- | crypto/x509/x509_cmp.c | 12 | ||||
-rw-r--r-- | crypto/x509/x509_lu.c | 2 | ||||
-rw-r--r-- | crypto/x509/x509_vfy.c | 15 | ||||
-rw-r--r-- | crypto/x509/x509_vfy.h | 6 |
6 files changed, 88 insertions, 78 deletions
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl index 4b9d095..b9cd45a 100644 --- a/crypto/x509/Makefile.ssl +++ b/crypto/x509/Makefile.ssl @@ -104,8 +104,8 @@ by_dir.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h by_dir.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h by_dir.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h by_dir.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -by_dir.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -by_dir.o: ../opensslv.h x509.h x509_vfy.h +by_dir.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +by_dir.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h by_file.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h by_file.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h by_file.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -114,9 +114,9 @@ by_file.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h by_file.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h by_file.o: ../../include/pem.h ../../include/pem2.h ../../include/pkcs7.h by_file.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -by_file.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -by_file.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -by_file.o: x509_vfy.h +by_file.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +by_file.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +by_file.o: ../opensslv.h x509.h x509_vfy.h v3_net.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_net.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_net.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -124,9 +124,9 @@ v3_net.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h v3_net.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h v3_net.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_net.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_net.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_net.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -v3_net.o: x509_vfy.h +v3_net.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +v3_net.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +v3_net.o: ../opensslv.h x509.h x509_vfy.h v3_x509.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_x509.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h v3_x509.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -134,9 +134,9 @@ v3_x509.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h v3_x509.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h v3_x509.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h v3_x509.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -v3_x509.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -v3_x509.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -v3_x509.o: x509_vfy.h +v3_x509.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +v3_x509.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +v3_x509.o: ../opensslv.h x509.h x509_vfy.h x509_cmp.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_cmp.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_cmp.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -144,9 +144,9 @@ x509_cmp.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_cmp.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_cmp.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_cmp.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_cmp.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_cmp.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509_cmp.o: x509.h x509_vfy.h +x509_cmp.o: ../../include/ripemd.h ../../include/rsa.h +x509_cmp.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_cmp.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_d2.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_d2.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_d2.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -154,9 +154,9 @@ x509_d2.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_d2.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_d2.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_d2.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_d2.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_d2.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -x509_d2.o: x509_vfy.h +x509_d2.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +x509_d2.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +x509_d2.o: ../opensslv.h x509.h x509_vfy.h x509_def.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_def.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_def.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -164,9 +164,9 @@ x509_def.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_def.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_def.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_def.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_def.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_def.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509_def.o: x509.h x509_vfy.h +x509_def.o: ../../include/ripemd.h ../../include/rsa.h +x509_def.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_def.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h x509_err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h @@ -174,8 +174,8 @@ x509_err.o: ../../include/evp.h ../../include/idea.h ../../include/md2.h x509_err.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h x509_err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h x509_err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_err.o: ../../include/sha.h ../../include/stack.h ../crypto.h ../opensslv.h -x509_err.o: x509.h x509_vfy.h +x509_err.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_err.o: ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_ext.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_ext.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_ext.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -183,9 +183,9 @@ x509_ext.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_ext.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_ext.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_ext.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_ext.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_ext.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509_ext.o: x509.h x509_vfy.h +x509_ext.o: ../../include/ripemd.h ../../include/rsa.h +x509_ext.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_ext.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_lu.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_lu.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_lu.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -194,8 +194,8 @@ x509_lu.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_lu.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h x509_lu.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h x509_lu.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_lu.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_lu.o: ../opensslv.h x509.h x509_vfy.h +x509_lu.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_lu.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_obj.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_obj.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_obj.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -204,8 +204,8 @@ x509_obj.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_obj.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h x509_obj.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h x509_obj.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_obj.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_obj.o: ../opensslv.h x509.h x509_vfy.h +x509_obj.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_obj.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_r2x.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_r2x.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_r2x.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -213,9 +213,9 @@ x509_r2x.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_r2x.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_r2x.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_r2x.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_r2x.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_r2x.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509_r2x.o: x509.h x509_vfy.h +x509_r2x.o: ../../include/ripemd.h ../../include/rsa.h +x509_r2x.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_r2x.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_req.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_req.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_req.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -224,8 +224,9 @@ x509_req.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_req.o: ../../include/mdc2.h ../../include/objects.h ../../include/pem.h x509_req.o: ../../include/pem2.h ../../include/pkcs7.h ../../include/rc2.h x509_req.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h -x509_req.o: ../../include/rsa.h ../../include/sha.h ../../include/stack.h -x509_req.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h +x509_req.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h +x509_req.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h +x509_req.o: x509.h x509_vfy.h x509_set.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_set.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_set.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -233,9 +234,9 @@ x509_set.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_set.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_set.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_set.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_set.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_set.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509_set.o: x509.h x509_vfy.h +x509_set.o: ../../include/ripemd.h ../../include/rsa.h +x509_set.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_set.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_txt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_txt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_txt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -244,8 +245,8 @@ x509_txt.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_txt.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h x509_txt.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h x509_txt.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_txt.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_txt.o: ../opensslv.h x509.h x509_vfy.h +x509_txt.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_txt.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509_v3.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_v3.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_v3.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -253,9 +254,9 @@ x509_v3.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509_v3.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509_v3.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509_v3.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509_v3.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509_v3.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -x509_v3.o: x509_vfy.h +x509_v3.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +x509_v3.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +x509_v3.o: ../opensslv.h x509.h x509_vfy.h x509_vfy.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509_vfy.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509_vfy.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -264,8 +265,8 @@ x509_vfy.o: ../../include/idea.h ../../include/lhash.h ../../include/md2.h x509_vfy.o: ../../include/md5.h ../../include/mdc2.h ../../include/objects.h x509_vfy.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h x509_vfy.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -x509_vfy.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h -x509_vfy.o: ../opensslv.h x509.h x509_vfy.h +x509_vfy.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509_vfy.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509name.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509name.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509name.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -273,9 +274,9 @@ x509name.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509name.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509name.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509name.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509name.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509name.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509name.o: x509.h x509_vfy.h +x509name.o: ../../include/ripemd.h ../../include/rsa.h +x509name.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509name.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509pack.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509pack.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509pack.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -283,9 +284,9 @@ x509pack.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509pack.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509pack.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509pack.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509pack.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509pack.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509pack.o: x509.h x509_vfy.h +x509pack.o: ../../include/ripemd.h ../../include/rsa.h +x509pack.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509pack.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509rset.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509rset.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509rset.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -293,9 +294,9 @@ x509rset.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509rset.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509rset.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509rset.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509rset.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509rset.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509rset.o: x509.h x509_vfy.h +x509rset.o: ../../include/ripemd.h ../../include/rsa.h +x509rset.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509rset.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x509type.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x509type.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x509type.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -303,9 +304,9 @@ x509type.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x509type.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x509type.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x509type.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x509type.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x509type.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h -x509type.o: x509.h x509_vfy.h +x509type.o: ../../include/ripemd.h ../../include/rsa.h +x509type.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h +x509type.o: ../cryptlib.h ../crypto.h ../opensslv.h x509.h x509_vfy.h x_all.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h x_all.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h x_all.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h @@ -313,6 +314,6 @@ x_all.o: ../../include/e_os.h ../../include/err.h ../../include/evp.h x_all.o: ../../include/idea.h ../../include/md2.h ../../include/md5.h x_all.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h x_all.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h -x_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/sha.h -x_all.o: ../../include/stack.h ../cryptlib.h ../crypto.h ../opensslv.h x509.h -x_all.o: x509_vfy.h +x_all.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h +x_all.o: ../../include/sha.h ../../include/stack.h ../cryptlib.h ../crypto.h +x_all.o: ../opensslv.h x509.h x509_vfy.h diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 2f1ca62..0cb6c04 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -66,6 +66,7 @@ extern "C" { #include "stack.h" #include "asn1.h" +#include "safestack.h" #ifndef NO_RSA #include "rsa.h" @@ -155,6 +156,8 @@ typedef struct X509_name_st unsigned long hash; /* Keep the hash around for lookups */ } X509_NAME; +DECLARE_STACK_OF(X509_NAME) + #define X509_EX_V_NETSCAPE_HACK 0x8000 #define X509_EX_V_INIT 0x0001 typedef struct X509_extension_st @@ -228,6 +231,9 @@ typedef struct x509_st char *name; } X509; +DECLARE_STACK_OF(X509) +DECLARE_ASN1_SET_OF(X509) + typedef struct X509_revoked_st { ASN1_INTEGER *serialNumber; @@ -870,9 +876,9 @@ ASN1_STRING * X509v3_unpack_string(ASN1_STRING **ex,int type, int X509_verify_cert(X509_STORE_CTX *ctx); /* lookup a cert from a X509 STACK */ -X509 *X509_find_by_issuer_and_serial(STACK *sk,X509_NAME *name, - ASN1_INTEGER *serial); -X509 *X509_find_by_subject(STACK *sk,X509_NAME *name); +X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk,X509_NAME *name, + ASN1_INTEGER *serial); +X509 *X509_find_by_subject(STACK_OF(X509) *sk,X509_NAME *name); int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp); PBEPARAM *PBEPARAM_new(void); diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 7d85018..7dec319 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -218,7 +218,7 @@ X509_NAME *x; /* Search a stack of X509 for a match */ X509 *X509_find_by_issuer_and_serial(sk,name,serial) -STACK *sk; +STACK_OF(X509) *sk; X509_NAME *name; ASN1_INTEGER *serial; { @@ -230,9 +230,9 @@ ASN1_INTEGER *serial; cinf.serialNumber=serial; cinf.issuer=name; - for (i=0; i<sk_num(sk); i++) + for (i=0; i<sk_X509_num(sk); i++) { - x509=(X509 *)sk_value(sk,i); + x509=sk_X509_value(sk,i); if (X509_issuer_and_serial_cmp(x509,&x) == 0) return(x509); } @@ -240,15 +240,15 @@ ASN1_INTEGER *serial; } X509 *X509_find_by_subject(sk,name) -STACK *sk; +STACK_OF(X509) *sk; X509_NAME *name; { X509 *x509; int i; - for (i=0; i<sk_num(sk); i++) + for (i=0; i<sk_X509_num(sk); i++) { - x509=(X509 *)sk_value(sk,i); + x509=sk_X509_value(sk,i); if (X509_NAME_cmp(X509_get_subject_name(x509),name) == 0) return(x509); } diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index a70ce77..bb913c2 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -421,7 +421,7 @@ void X509_STORE_CTX_init(ctx,store,x509,chain) X509_STORE_CTX *ctx; X509_STORE *store; X509 *x509; -STACK *chain; +STACK_OF(X509) *chain; { ctx->ctx=store; ctx->current_method=0; diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 0d3187d..10f1848 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -112,7 +112,7 @@ X509_STORE_CTX *ctx; int depth,i,ok=0; int num; int (*cb)(); - STACK *sktmp=NULL; + STACK_OF(X509) *sktmp=NULL; if (ctx->cert == NULL) { @@ -138,7 +138,8 @@ X509_STORE_CTX *ctx; } /* We use a temporary so we can chop and hack at it */ - if ((ctx->untrusted != NULL) && (sktmp=sk_dup(ctx->untrusted)) == NULL) + if (ctx->untrusted != NULL + && (sktmp=sk_X509_dup(ctx->untrusted)) == NULL) { X509err(X509_F_X509_VERIFY_CERT,ERR_R_MALLOC_FAILURE); goto end; @@ -171,7 +172,7 @@ X509_STORE_CTX *ctx; goto end; } CRYPTO_add(&xtmp->references,1,CRYPTO_LOCK_X509); - sk_delete_ptr(sktmp,(char *)xtmp); + sk_X509_delete_ptr(sktmp,xtmp); ctx->last_untrusted++; x=xtmp; num++; @@ -290,7 +291,7 @@ X509_STORE_CTX *ctx; end: X509_get_pubkey_parameters(NULL,ctx->chain); } - if (sktmp != NULL) sk_free(sktmp); + if (sktmp != NULL) sk_X509_free(sktmp); if (chain_ss != NULL) X509_free(chain_ss); return(ok); } @@ -659,9 +660,11 @@ X509 *x; void X509_STORE_CTX_set_chain(ctx,sk) X509_STORE_CTX *ctx; -STACK *sk; +STACK_OF(X509) *sk; { ctx->untrusted=sk; } - +IMPLEMENT_STACK_OF(X509) +IMPLEMENT_ASN1_SET_OF(X509) +IMPLEMENT_STACK_OF(X509_NAME) diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index 929045f..e49fb18 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -192,7 +192,7 @@ struct x509_store_state_st /* The following are set by the caller */ X509 *cert; /* The cert to check */ - STACK *untrusted; /* chain of X509s - untrusted - passed in */ + STACK_OF(X509) *untrusted; /* chain of X509s - untrusted - passed in */ /* The following is built up */ int depth; /* how far to go looking up certs */ @@ -262,7 +262,7 @@ X509_STORE *X509_STORE_new(void ); void X509_STORE_free(X509_STORE *v); void X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, - X509 *x509, STACK *chain); + X509 *x509, STACK_OF(X509) *chain); void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx); X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); @@ -317,7 +317,7 @@ int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); X509 * X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); STACK * X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); void X509_STORE_CTX_set_cert(X509_STORE_CTX *c,X509 *x); -void X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK /* X509 */ *sk); +void X509_STORE_CTX_set_chain(X509_STORE_CTX *c,STACK_OF(X509) *sk); #else |