CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

projects / FreeBSD / FreeBSD.git / commit

author	simon <simon@FreeBSD.org>
	Sat, 29 Jul 2006 19:14:51 +0000 (19:14 +0000)
committer	simon <simon@FreeBSD.org>
	Sat, 29 Jul 2006 19:14:51 +0000 (19:14 +0000)
commit	e07cc0214a55c667871ff33ceb54311ec000283e
tree	f898e2a96cfe066221d2bdd627d5eddc70044a57	tree \| snapshot
parent	9159ca2b0ed030ab3c19210cd933875c52c9ed3d	commit \| diff

Resolve conflicts after import of OpenSSL 0.9.8b.

112 files changed:

crypto/openssl/apps/der_chop	[deleted file]	blob \| history
crypto/openssl/apps/der_chop.in	[deleted file]	blob \| history
crypto/openssl/apps/openssl.cnf		diff \| blob \| history
crypto/openssl/apps/speed.c		diff \| blob \| history
crypto/openssl/bugs/VC16.bug	[deleted file]	blob \| history
crypto/openssl/certs/ICE-CA.pem	[deleted file]	blob \| history
crypto/openssl/certs/ICE-root.pem	[deleted file]	blob \| history
crypto/openssl/certs/ICE-user.pem	[deleted file]	blob \| history
crypto/openssl/certs/ICE.crl	[deleted file]	blob \| history
crypto/openssl/certs/RegTP-4R.pem	[deleted file]	blob \| history
crypto/openssl/certs/ca-cert.pem	[deleted file]	blob \| history
crypto/openssl/certs/dsa-ca.pem	[deleted file]	blob \| history
crypto/openssl/certs/dsa-pca.pem	[deleted file]	blob \| history
crypto/openssl/certs/factory.pem	[deleted file]	blob \| history
crypto/openssl/certs/nortelCA.pem	[deleted file]	blob \| history
crypto/openssl/certs/pca-cert.pem	[deleted file]	blob \| history
crypto/openssl/certs/rsa-cca.pem	[deleted file]	blob \| history
crypto/openssl/certs/timCA.pem	[deleted file]	blob \| history
crypto/openssl/certs/tjhCA.pem	[deleted file]	blob \| history
crypto/openssl/certs/vsign2.pem	[deleted file]	blob \| history
crypto/openssl/certs/vsigntca.pem	[deleted file]	blob \| history
crypto/openssl/comm.txt	[deleted file]	blob \| history
crypto/openssl/comms.txt	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.s	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.s.works	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/add.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/div.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/mul.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha.works/sub.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/add.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/div.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/mul.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/mul_add.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/sqr.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/alpha/sub.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/bn-alpha.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/ca.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/co-alpha.pl	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/mips1.s	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/pa-risc.s	[deleted file]	blob \| history
crypto/openssl/crypto/bn/asm/r3000.s	[deleted file]	blob \| history
crypto/openssl/crypto/des/des.h		diff \| blob \| history
crypto/openssl/crypto/ec/ecp_recp.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/eng_all.c		diff \| blob \| history
crypto/openssl/crypto/engine/hw.ec	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_4758_cca.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_4758_cca_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_4758_cca_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_aep.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_aep_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_aep_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_atalla.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_atalla_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_atalla_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_cryptodev.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_cswift.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_cswift_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_cswift_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ncipher.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ncipher_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ncipher_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_nuron.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_nuron_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_nuron_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_sureware.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_sureware_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_sureware_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ubsec.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ubsec_err.c	[deleted file]	blob \| history
crypto/openssl/crypto/engine/hw_ubsec_err.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/aep.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/atalla.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/cswift.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h	[deleted file]	blob \| history
crypto/openssl/crypto/engine/vendor_defns/sureware.h	[deleted file]	blob \| history
crypto/openssl/crypto/err/err_all.c		diff \| blob \| history
crypto/openssl/crypto/evp/evp.h		diff \| blob \| history
crypto/openssl/crypto/idea/i_skey.c		diff \| blob \| history
crypto/openssl/crypto/idea/idea.h		diff \| blob \| history
crypto/openssl/crypto/idea/idea_spd.c		diff \| blob \| history
crypto/openssl/crypto/idea/ideatest.c		diff \| blob \| history
crypto/openssl/crypto/perlasm/alpha.pl	[deleted file]	blob \| history
crypto/openssl/crypto/rsa/rsa.h		diff \| blob \| history
crypto/openssl/crypto/rsa/rsa_eay.c		diff \| blob \| history
crypto/openssl/crypto/rsa/rsa_lib.c		diff \| blob \| history
crypto/openssl/ssl/s23_clnt.c		diff \| blob \| history
crypto/openssl/ssl/s23_lib.c		diff \| blob \| history
crypto/openssl/ssl/s23_srvr.c		diff \| blob \| history
crypto/openssl/ssl/s2_clnt.c		diff \| blob \| history
crypto/openssl/ssl/s2_enc.c		diff \| blob \| history
crypto/openssl/ssl/s2_lib.c		diff \| blob \| history
crypto/openssl/ssl/s2_meth.c		diff \| blob \| history
crypto/openssl/ssl/s2_srvr.c		diff \| blob \| history
crypto/openssl/test/testfipsssl	[deleted file]	blob \| history
crypto/openssl/util/pl/BC-16.pl	[deleted file]	blob \| history
crypto/openssl/util/pl/Mingw32.pl		diff \| blob \| history
crypto/openssl/util/pl/VC-16.pl	[deleted file]	blob \| history
crypto/openssl/util/pl/VC-CE.pl	[deleted file]	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom