CVSROOT: /cvs
Module name: src
Changes by: d...@cvs.openbsd.org 2009/01/09 05:15:52
Modified files:
lib/libssl/src : CHANGES Configure FAQ Makefile Makefile.org
Makefile.shared NEWS README e_os.h makevms.com
openssl.spec
lib/libssl/src/apps: Makefile apps.c apps.h asn1pars.c crl.c
dgst.c dsa.c enc.c engine.c genrsa.c
makeapps.com nseq.c ocsp.c openssl.c
pkcs12.c pkcs8.c rsautl.c s_client.c
s_server.c smime.c speed.c spkac.c verify.c
version.c x509.c
lib/libssl/src/crypto: cryptlib.c crypto-lib.com crypto.h
install.com mem.c mem_dbg.c
opensslconf.h.in opensslv.h ossl_typ.h
symhacks.h
lib/libssl/src/crypto/aes: aes.h aes_cbc.c aes_core.c
lib/libssl/src/crypto/aes/asm: aes-586.pl
lib/libssl/src/crypto/asn1: a_mbstr.c a_sign.c a_strex.c
a_strnid.c a_verify.c asn1t.h
asn_moid.c asn_pack.c nsseq.c
p5_pbe.c p5_pbev2.c p8_pkey.c
t_bitst.c t_crl.c t_spki.c t_x509.c
t_x509a.c tasn_dec.c tasn_enc.c
tasn_fre.c tasn_new.c tasn_prn.c
tasn_typ.c tasn_utl.c x_algor.c
x_bignum.c x_exten.c x_long.c
x_x509a.c
lib/libssl/src/crypto/bf: bf_skey.c blowfish.h
lib/libssl/src/crypto/bio: bss_bio.c bss_file.c
lib/libssl/src/crypto/bn: Makefile bn.h bn_lib.c bn_nist.c
bn_rand.c bn_shift.c
lib/libssl/src/crypto/buffer: buffer.c
lib/libssl/src/crypto/cast: c_skey.c cast.h
lib/libssl/src/crypto/cms: cms_smime.c
lib/libssl/src/crypto/comp: c_zlib.c
lib/libssl/src/crypto/conf: conf_mall.c conf_mod.c conf_sap.c
lib/libssl/src/crypto/des: des_enc.c ecb_enc.c enc_read.c
enc_writ.c set_key.c
lib/libssl/src/crypto/dh: Makefile dh.h dh_asn1.c dh_check.c
dh_err.c dh_gen.c dh_key.c
lib/libssl/src/crypto/dsa: Makefile dsa.h dsa_asn1.c dsa_err.c
dsa_gen.c dsa_key.c dsa_lib.c
dsa_ossl.c dsa_sign.c dsa_vrf.c
lib/libssl/src/crypto/ecdh: Makefile
lib/libssl/src/crypto/ecdsa: Makefile
lib/libssl/src/crypto/engine: Makefile eng_cnf.c enginetest.c
lib/libssl/src/crypto/err: err.c err.h err_all.c err_prn.c
openssl.ec
lib/libssl/src/crypto/evp: Makefile bio_md.c digest.c e_aes.c
e_des.c e_des3.c e_null.c e_rc4.c
evp.h evp_acnf.c evp_enc.c evp_err.c
evp_lib.c evp_locl.h evp_pbe.c
evp_pkey.c m_dss.c m_dss1.c m_md2.c
m_md4.c m_md5.c m_mdc2.c m_sha.c
m_sha1.c names.c p5_crpt.c p5_crpt2.c
p_sign.c p_verify.c
lib/libssl/src/crypto/hmac: hmac.c
lib/libssl/src/crypto/idea: idea.h
lib/libssl/src/crypto/md2: md2.h md2_dgst.c
lib/libssl/src/crypto/md4: md4.h md4_dgst.c
lib/libssl/src/crypto/md5: md5.h md5_dgst.c
lib/libssl/src/crypto/mdc2: Makefile mdc2.h
lib/libssl/src/crypto/objects: obj_dat.pl obj_mac.num
objects.txt
lib/libssl/src/crypto/ocsp: ocsp_asn.c ocsp_ht.c ocsp_srv.c
ocsp_vfy.c
lib/libssl/src/crypto/pem: pem.h pem_all.c pem_lib.c pem_x509.c
pem_xaux.c
lib/libssl/src/crypto/pkcs12: p12_add.c p12_asn.c p12_attr.c
p12_crpt.c p12_crt.c p12_decr.c
p12_init.c p12_key.c p12_kiss.c
p12_mutl.c p12_npas.c p12_p8d.c
p12_p8e.c p12_utl.c pkcs12.h
lib/libssl/src/crypto/pkcs7: pk7_asn1.c pk7_attr.c pk7_mime.c
pk7_smime.c
lib/libssl/src/crypto/rand: Makefile md_rand.c rand.h rand_err.c
rand_lcl.h rand_lib.c randfile.c
lib/libssl/src/crypto/rc2: rc2.h rc2_skey.c
lib/libssl/src/crypto/rc4: rc4.h rc4_skey.c
lib/libssl/src/crypto/rc4/asm: rc4-x86_64.pl
lib/libssl/src/crypto/rc5: rc5.h
lib/libssl/src/crypto/ripemd: ripemd.h rmd_dgst.c rmd_locl.h
lib/libssl/src/crypto/rsa: Makefile rsa.h rsa_asn1.c rsa_eay.c
rsa_err.c rsa_gen.c rsa_lib.c
rsa_null.c rsa_oaep.c rsa_sign.c
lib/libssl/src/crypto/sha: sha.h sha1_one.c sha1dgst.c
sha_dgst.c sha_locl.h
lib/libssl/src/crypto/ui: ui_openssl.c
lib/libssl/src/crypto/x509: by_dir.c x509_cmp.c x509_trs.c
x509cset.c x509spki.c
lib/libssl/src/crypto/x509v3: ext_dat.h pcy_data.c pcy_tree.c
tabtest.c v3_addr.c v3_akey.c
v3_akeya.c v3_alt.c v3_bcons.c
v3_bitst.c v3_conf.c v3_cpols.c
v3_crld.c v3_enum.c v3_extku.c
v3_genn.c v3_ia5.c v3_info.c
v3_int.c v3_lib.c v3_ocsp.c
v3_pku.c v3_prn.c v3_purp.c
v3_skey.c v3_sxnet.c v3_utl.c
v3conf.c v3prin.c x509v3.h
lib/libssl/src/demos/asn1: ocsp.c
lib/libssl/src/doc/crypto: RAND_egd.pod
lib/libssl/src/engines: Makefile
lib/libssl/src/ms: do_masm.bat do_nasm.bat test.bat
lib/libssl/src/ssl: Makefile d1_pkt.c s2_clnt.c s2_srvr.c
s3_clnt.c s3_pkt.c s3_srvr.c ssl_ciph.c
ssl_locl.h ssltest.c t1_enc.c
lib/libssl/src/test: Makefile tests.com
lib/libssl/src/util: libeay.num mk1mf.pl mkdef.pl mkerr.pl
mkfiles.pl mklink.pl
lib/libssl/src/util/pl: VC-32.pl
Log message:
resolve conflicts
