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

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - crypto/evp/evp_pkey.c

projects / FreeBSD / FreeBSD.git / commit

author	simon <simon@FreeBSD.org>
	Sat, 13 Mar 2010 19:22:41 +0000 (19:22 +0000)
committer	simon <simon@FreeBSD.org>
	Sat, 13 Mar 2010 19:22:41 +0000 (19:22 +0000)
commit	0d816bbd980d8201a2ad23ccd05f7bde16565282
tree	909a7c21b7df72ae8c08b80b468a4dd75b3820be	tree \| snapshot
parent	7fd3bd147ec574621124307eca10ead5353e34ba	commit \| diff
parent	cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385	commit \| diff

Merge OpenSSL 0.9.8m into head.

This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.

MFC after: 3 weeks

207 files changed:

crypto/openssl/CHANGES	diff1 \|	diff2 \|	blob \| history
crypto/openssl/Configure	diff1 \|	diff2 \|	blob \| history
crypto/openssl/FAQ	diff1 \|	diff2 \|	blob \| history
crypto/openssl/Makefile	diff1 \|	\|	blob \| history
crypto/openssl/Makefile.org	diff1 \|	diff2 \|	blob \| history
crypto/openssl/NEWS	diff1 \|	diff2 \|	blob \| history
crypto/openssl/README	diff1 \|	\|	blob \| history
crypto/openssl/apps/CA.sh	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/apps.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/ca.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/dsa.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/dsaparam.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/enc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/gendsa.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/genrsa.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/openssl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/openssl.cnf	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/pkcs12.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/req.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/s_apps.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/s_cb.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/s_client.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/s_server.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/s_socket.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/speed.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/apps/x509.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/config	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/aes/aes_cfb.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/aes/asm/aes-x86_64.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/a_mbstr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/a_object.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/asn1.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/asn1_err.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/asn1_gen.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/asn1_par.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/asn1/t_x509.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bio/bio.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bio/bss_dgram.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bio/bss_file.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/asm/x86_64-gcc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/bn_div.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/bn_exp.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/bn_gf2m.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/bn_mul.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/bn/bntest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/camellia/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cast/c_cfb64.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cast/c_ecb.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cast/c_enc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cast/c_ofb64.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cast/cast.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cms/cms_ess.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cms/cms_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/comp/c_zlib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/cryptlib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/dsa/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/dsa/dsa_asn1.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/dsa/dsa_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/dso/dso_dlfcn.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ec/ec2_smpl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ecdsa/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ecdsa/ecs_ossl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ecdsa/ecs_sign.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/eng_cnf.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/eng_cryptodev.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/eng_ctrl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/eng_err.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/eng_table.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/engine/engine.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/err/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/err/err_all.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/evp/c_allc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/evp/c_alld.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/evp/digest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/evp/evp_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/evp/evp_locl.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/lhash/lhash.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/md5/asm/md5-x86_64.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/o_init.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/o_str.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/objects/obj_dat.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/objects/obj_dat.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/objects/obj_mac.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/objects/obj_mac.num	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/objects/objects.txt	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ocsp/ocsp_prn.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/opensslv.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pem/pem_seal.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/perlasm/x86_64-xlate.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pkcs12/p12_attr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pkcs12/p12_key.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pkcs12/p12_utl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pkcs12/pkcs12.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/pkcs7/pk7_mime.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rand/rand_win.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rand/randfile.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa_eay.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa_eng.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa_oaep.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa_pss.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/rsa/rsa_sign.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/sha/sha512.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/stack/safestack.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/symhacks.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/ui/ui_openssl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/by_dir.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/x509.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/x509_lu.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/x509_vfy.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/x509_vfy.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509/x509_vpm.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509v3/pcy_tree.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509v3/v3_alt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/crypto/x509v3/v3_ocsp.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/demos/x509/mkcert.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/demos/x509/mkreq.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/apps/enc.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/apps/verify.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/ASN1_generate_nconf.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/EVP_DigestInit.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/PKCS12_parse.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/bn_internal.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/d2i_X509.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/d2i_X509_CRL.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/d2i_X509_REQ.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/hmac.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/crypto/pem.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/doc/ssl/SSL_CTX_set_options.pod	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/alpha.opt	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/e_capi.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/e_capi_err.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/e_capi_err.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/e_ubsec.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/engines/ia64.opt	\|	diff2 \|	blob \| history
crypto/openssl/fips/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/aes/fips_aesavs.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/des/fips_desmovs.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/dsa/fips_dsa_key.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/dsa/fips_dsa_sign.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/dsa/fips_dsatest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/dsa/fips_dssvs.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/fips_locl.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/fips_test_suite.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/fips_utl.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/fipsalgtest.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/fipsld	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/hmac/fips_hmac.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/hmac/fips_hmac_selftest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/rand/fips_rand.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/rand/fips_rngvs.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/rsa/fips_rsagtest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/rsa/fips_rsastest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/rsa/fips_rsavtest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/sha/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/fips/sha/fips_sha1_selftest.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/openssl.spec	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_both.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_clnt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_enc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_pkt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/d1_srvr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/dtls1.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/kssl.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s23_clnt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s23_srvr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s2_srvr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s3_both.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s3_clnt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s3_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s3_pkt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/s3_srvr.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl3.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_algs.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_asn1.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_cert.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_ciph.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_err.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_locl.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_rsa.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_sess.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_stat.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/ssl_txt.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/t1_enc.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/t1_lib.c	diff1 \|	diff2 \|	blob \| history
crypto/openssl/ssl/t1_reneg.c	\|	diff2 \|	blob \| history
crypto/openssl/ssl/tls1.h	diff1 \|	diff2 \|	blob \| history
crypto/openssl/test/Makefile	diff1 \|	diff2 \|	blob \| history
crypto/openssl/test/cms-test.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/domd	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/libeay.num	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/mk1mf.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/mkdef.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/mkerr.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/pl/Mingw32.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/pl/VC-32.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/pod2man.pl	diff1 \|	diff2 \|	blob \| history
crypto/openssl/util/shlib_wrap.sh	diff1 \|	diff2 \|	blob \| history
secure/lib/libssl/Makefile	diff1 \|	\|	blob \| history

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

RSS Atom