CVSROOT: /cvs
Module name: src
Changes by: [email protected] 2012/10/13 15:25:14
Modified files:
lib/libssl/src : CHANGES Configure FAQ Makefile Makefile.org
NEWS README config e_os.h e_os2.h makevms.com
openssl.spec
lib/libssl/src/apps: Makefile apps.c apps.h ca.c ciphers.c
dgst.c enc.c makeapps.com openssl.c progs.h
progs.pl req.c s_cb.c s_client.c s_server.c
server.pem sess_id.c speed.c verify.c
x509.c
lib/libssl/src/crypto: Makefile cpt_err.c cryptlib.c cryptlib.h
crypto-lib.com crypto.h mem.c opensslv.h
ossl_typ.h symhacks.h x86_64cpuid.pl
lib/libssl/src/crypto/aes: aes.h aes_core.c aes_misc.c
lib/libssl/src/crypto/aes/asm: aes-586.pl aes-x86_64.pl
aesni-x86_64.pl
lib/libssl/src/crypto/asn1: a_digest.c a_int.c a_sign.c
a_verify.c asn1.h asn1_err.c
asn_mime.c n_pkey.c p5_pbev2.c
t_crl.c t_x509.c tasn_prn.c
x_algor.c x_name.c x_pubkey.c
lib/libssl/src/crypto/bf: bf_skey.c blowfish.h
lib/libssl/src/crypto/bio: b_sock.c bio.h bio_err.c bio_lib.c
bss_bio.c bss_dgram.c
lib/libssl/src/crypto/bn: Makefile bn.h bn_div.c bn_exp.c
bn_gf2m.c bn_lcl.h bn_lib.c bn_mont.c
bn_nist.c bn_print.c bn_shift.c
bntest.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_rle.c
lib/libssl/src/crypto/des: des.h set_key.c
lib/libssl/src/crypto/dh: dh.h dh_err.c dh_gen.c dh_key.c
dh_lib.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/dso: dso_dlfcn.c
lib/libssl/src/crypto/ec: ec.h ec2_smpl.c ec_cvt.c ec_err.c
ec_lcl.h ec_lib.c ecp_mont.c
ecp_nist.c ecp_smpl.c ectest.c
lib/libssl/src/crypto/engine: Makefile eng_all.c eng_cryptodev.c
eng_fat.c engine.h
lib/libssl/src/crypto/err: err.c err.h err_all.c
lib/libssl/src/crypto/evp: Makefile bio_md.c bio_ok.c c_allc.c
digest.c e_aes.c e_des3.c e_null.c
e_rc2.c e_rc4.c evp.h evp_enc.c
evp_err.c evp_key.c evp_lib.c
evp_locl.h evp_pbe.c evptests.txt
m_dss.c m_dss1.c m_md4.c m_md5.c
m_mdc2.c m_ripemd.c m_sha.c m_sha1.c
names.c p5_crpt.c p5_crpt2.c p_open.c
p_seal.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_mac.num objects.txt
lib/libssl/src/crypto/ocsp: ocsp_lib.c
lib/libssl/src/crypto/perlasm: x86_64-xlate.pl x86asm.pl
x86gas.pl x86nasm.pl
lib/libssl/src/crypto/pkcs12: p12_decr.c p12_key.c p12_kiss.c
p12_mutl.c
lib/libssl/src/crypto/pkcs7: pk7_doit.c pk7_smime.c
lib/libssl/src/crypto/rand: md_rand.c rand.h rand_err.c
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-586.pl rc4-x86_64.pl
lib/libssl/src/crypto/ripemd: ripemd.h rmd_dgst.c
lib/libssl/src/crypto/rsa: Makefile rsa.h rsa_asn1.c rsa_err.c
rsa_gen.c rsa_lib.c rsa_oaep.c
rsa_sign.c
lib/libssl/src/crypto/sha: sha.h sha1dgst.c sha_dgst.c
sha_locl.h
lib/libssl/src/crypto/sha/asm: sha1-586.pl
lib/libssl/src/crypto/stack: safestack.h
lib/libssl/src/crypto/ts: ts_rsp_verify.c
lib/libssl/src/crypto/ui: ui.h ui_openssl.c
lib/libssl/src/crypto/x509: x509.h x509_cmp.c x509_lu.c
x509_vfy.c x509type.c x_all.c
lib/libssl/src/crypto/x509v3: v3_asid.c v3_skey.c
lib/libssl/src/doc/apps: openssl.pod
lib/libssl/src/doc/crypto: EVP_DigestInit.pod
lib/libssl/src/doc/ssl: SSL_alert_type_string.pod
lib/libssl/src/engines: e_capi.c
lib/libssl/src/ssl: Makefile bio_ssl.c d1_clnt.c d1_pkt.c
d1_srvr.c dtls1.h kssl.c kssl.h s23_clnt.c
s23_meth.c s23_srvr.c s3_both.c s3_clnt.c
s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c
ssl-lib.com ssl.h ssl2.h ssl3.h ssl_algs.c
ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c
ssl_lib.c ssl_locl.h ssl_sess.c ssl_txt.c
ssltest.c t1_clnt.c t1_enc.c t1_lib.c
t1_meth.c t1_srvr.c tls1.h
lib/libssl/src/test: CAss.cnf Makefile Uss.cnf maketests.com
tests.com testssl
lib/libssl/src/util: cygwin.sh libeay.num mk1mf.pl mkdef.pl
mkfiles.pl ssleay.num
lib/libssl/src/util/pl: VC-32.pl
Log message:
resolve conflicts
