CVSROOT: /cvs
Module name: src
Changes by: [EMAIL PROTECTED] 2008/09/06 06:17:54
Modified files:
lib/libssl/src : CHANGES Configure FAQ INSTALL INSTALL.W32
LICENSE Makefile.org NEWS README config e_os.h
e_os2.h install.com makevms.com openssl.spec
lib/libssl/src/VMS: mkshared.com
lib/libssl/src/apps: CA.pl.in CA.sh apps.c apps.h asn1pars.c
ca.c ciphers.c crl.c dgst.c dh.c dhparam.c
dsa.c dsaparam.c enc.c engine.c gendh.c
gendsa.c genrsa.c makeapps.com ocsp.c
openssl-vms.cnf openssl.c openssl.cnf
passwd.c pkcs12.c progs.h progs.pl rand.c
req.c rsa.c rsautl.c s_apps.h s_cb.c
s_client.c s_server.c s_socket.c s_time.c
sess_id.c smime.c speed.c spkac.c verify.c
version.c x509.c
lib/libssl/src/crypto: cpt_err.c cryptlib.c cryptlib.h
crypto-lib.com crypto.h cversion.c
ebcdic.c ex_data.c install.com
md32_common.h mem.c mem_dbg.c
opensslconf.h.in opensslv.h ossl_typ.h
symhacks.h tmdiff.c tmdiff.h uid.c
lib/libssl/src/crypto/aes: aes.h aes_cbc.c aes_core.c aes_locl.h
aes_misc.c
lib/libssl/src/crypto/aes/asm: aes-586.pl
lib/libssl/src/crypto/asn1: a_bitstr.c a_bool.c a_bytes.c
a_d2i_fp.c a_digest.c a_dup.c
a_enum.c a_gentm.c a_hdr.c
a_i2d_fp.c a_int.c a_mbstr.c
a_meth.c a_object.c a_octet.c
a_set.c a_sign.c a_strex.c a_type.c
a_utctm.c a_verify.c asn1.h
asn1_err.c asn1_lib.c asn1_mac.h
asn1_par.c asn1t.h asn_moid.c
asn_pack.c d2i_pr.c d2i_pu.c
evp_asn1.c i2d_pr.c i2d_pu.c
n_pkey.c p5_pbe.c p5_pbev2.c t_crl.c
t_pkey.c t_req.c t_spki.c t_x509.c
tasn_dec.c tasn_enc.c tasn_fre.c
tasn_new.c tasn_typ.c tasn_utl.c
x_algor.c x_bignum.c x_crl.c
x_exten.c x_long.c x_name.c x_pkey.c
x_pubkey.c x_req.c x_x509.c
x_x509a.c
lib/libssl/src/crypto/bf: bf_ecb.c bf_enc.c bf_opts.c bf_skey.c
bfspeed.c bftest.c blowfish.h
lib/libssl/src/crypto/bio: b_dump.c b_print.c b_sock.c bf_nbio.c
bio.h bio_err.c bio_lib.c bss_acpt.c
bss_conn.c bss_fd.c bss_file.c
bss_log.c bss_sock.c
lib/libssl/src/crypto/bn: bn.h bn_add.c bn_asm.c bn_blind.c
bn_ctx.c bn_div.c bn_err.c bn_exp.c
bn_exp2.c bn_gcd.c bn_kron.c bn_lcl.h
bn_lib.c bn_mod.c bn_mont.c bn_mpi.c
bn_mul.c bn_prime.c bn_prime.h
bn_prime.pl bn_print.c bn_rand.c
bn_recp.c bn_shift.c bn_sqr.c
bn_sqrt.c bn_word.c bntest.c exptest.c
lib/libssl/src/crypto/bn/asm: bn-586.pl ia64.S
lib/libssl/src/crypto/buffer: buf_err.c buffer.c buffer.h
lib/libssl/src/crypto/cast: c_ecb.c c_skey.c cast.h cast_spd.c
castopts.c casttest.c
lib/libssl/src/crypto/comp: c_zlib.c comp.h comp_err.c
comp_lib.c
lib/libssl/src/crypto/conf: conf.h conf_api.c conf_def.c
conf_err.c conf_lib.c conf_mod.c
conf_sap.c
lib/libssl/src/crypto/des: cfb64ede.c cfb_enc.c des.h des_enc.c
des_locl.h des_old.c des_old.h
des_opts.c des_ver.h destest.c
ecb3_enc.c ecb_enc.c ede_cbcm_enc.c
fcrypt.c read2pwd.c set_key.c speed.c
str2key.c xcbc_enc.c
lib/libssl/src/crypto/dh: dh.h dh_check.c dh_err.c dh_gen.c
dh_key.c dh_lib.c dhtest.c
lib/libssl/src/crypto/dsa: dsa.h dsa_err.c dsa_gen.c dsa_key.c
dsa_lib.c dsa_ossl.c dsa_sign.c
dsa_vrf.c dsatest.c
lib/libssl/src/crypto/dso: dso.h dso_dl.c dso_dlfcn.c dso_err.c
dso_lib.c dso_null.c dso_vms.c
dso_win32.c
lib/libssl/src/crypto/ec: ec.h ec_cvt.c ec_err.c ec_lcl.h
ec_lib.c ec_mult.c ecp_mont.c
ecp_nist.c ecp_smpl.c ectest.c
lib/libssl/src/crypto/engine: eng_all.c eng_cnf.c eng_ctrl.c
eng_dyn.c eng_err.c eng_fat.c
eng_init.c eng_int.h eng_lib.c
eng_list.c eng_openssl.c
eng_pkey.c eng_table.c engine.h
enginetest.c tb_cipher.c tb_dh.c
tb_digest.c tb_dsa.c tb_rand.c
tb_rsa.c
lib/libssl/src/crypto/err: err.c err.h err_all.c err_prn.c
openssl.ec
lib/libssl/src/crypto/evp: bio_b64.c bio_enc.c bio_md.c bio_ok.c
c_all.c c_allc.c c_alld.c digest.c
e_aes.c e_bf.c e_cast.c e_des.c
e_des3.c e_idea.c e_null.c e_rc2.c
e_rc4.c e_rc5.c e_xcbc_d.c encode.c
evp.h evp_enc.c evp_err.c evp_key.c
evp_lib.c evp_locl.h evp_pbe.c
evp_pkey.c evp_test.c evptests.txt
m_dss.c m_dss1.c m_md2.c m_md4.c
m_md5.c m_mdc2.c m_null.c m_ripemd.c
m_sha.c m_sha1.c names.c p5_crpt.c
p5_crpt2.c p_dec.c p_enc.c p_lib.c
p_open.c p_seal.c p_verify.c
lib/libssl/src/crypto/hmac: hmac.c hmac.h
lib/libssl/src/crypto/idea: idea.h
lib/libssl/src/crypto/krb5: krb5_asn.h
lib/libssl/src/crypto/lhash: lhash.c lhash.h
lib/libssl/src/crypto/md2: md2.h md2_dgst.c md2_one.c md2test.c
lib/libssl/src/crypto/md4: md4.h md4_dgst.c md4_locl.h md4_one.c
md4test.c
lib/libssl/src/crypto/md5: md5.h md5_dgst.c md5_locl.h md5_one.c
md5test.c
lib/libssl/src/crypto/md5/asm: md5-586.pl
lib/libssl/src/crypto/mdc2: Makefile mdc2.h
lib/libssl/src/crypto/objects: o_names.c obj_dat.c obj_dat.pl
obj_err.c obj_lib.c obj_mac.num
objects.h objects.txt
lib/libssl/src/crypto/ocsp: ocsp.h ocsp_asn.c ocsp_cl.c
ocsp_err.c ocsp_ext.c ocsp_ht.c
ocsp_lib.c ocsp_prn.c ocsp_vfy.c
lib/libssl/src/crypto/pem: pem.h pem_all.c pem_err.c pem_info.c
pem_lib.c pem_oth.c pem_pk8.c
pem_pkey.c pem_seal.c pem_xaux.c
lib/libssl/src/crypto/perlasm: cbc.pl x86asm.pl x86ms.pl
x86nasm.pl x86unix.pl
lib/libssl/src/crypto/pkcs12: p12_add.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
pk12err.c pkcs12.h
lib/libssl/src/crypto/pkcs7: bio_ber.c example.c pk7_asn1.c
pk7_attr.c pk7_doit.c pk7_lib.c
pk7_mime.c pk7_smime.c pkcs7.h
pkcs7err.c
lib/libssl/src/crypto/rand: md_rand.c rand.h rand_egd.c
rand_err.c rand_lib.c rand_unix.c
rand_win.c randfile.c randtest.c
lib/libssl/src/crypto/rc2: rc2.h rc2_ecb.c rc2_skey.c rc2speed.c
rc2test.c
lib/libssl/src/crypto/rc4: rc4.c rc4.h rc4_enc.c rc4_skey.c
rc4speed.c rc4test.c
lib/libssl/src/crypto/rc4/asm: rc4-586.pl
lib/libssl/src/crypto/rc5: rc5.h
lib/libssl/src/crypto/ripemd: ripemd.h rmd_dgst.c rmd_locl.h
rmd_one.c rmdtest.c
lib/libssl/src/crypto/ripemd/asm: rmd-586.pl
lib/libssl/src/crypto/rsa: rsa.h rsa_asn1.c rsa_chk.c rsa_eay.c
rsa_err.c rsa_gen.c rsa_lib.c
rsa_null.c rsa_oaep.c rsa_saos.c
rsa_sign.c rsa_test.c
lib/libssl/src/crypto/sha: sha.h sha1_one.c sha1dgst.c
sha1test.c sha_dgst.c sha_locl.h
sha_one.c shatest.c
lib/libssl/src/crypto/sha/asm: sha1-586.pl
lib/libssl/src/crypto/stack: safestack.h stack.c stack.h
lib/libssl/src/crypto/threads: mttest.c th-lock.c
lib/libssl/src/crypto/txt_db: txt_db.c txt_db.h
lib/libssl/src/crypto/ui: ui.h ui_err.c ui_lib.c ui_locl.h
ui_openssl.c ui_util.c
lib/libssl/src/crypto/x509: by_dir.c x509.h x509_att.c
x509_cmp.c x509_err.c x509_lu.c
x509_r2x.c x509_req.c x509_trs.c
x509_txt.c x509_v3.c x509_vfy.c
x509_vfy.h x509spki.c x509type.c
x_all.c
lib/libssl/src/crypto/x509v3: ext_dat.h v3_akey.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_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
v3err.c x509v3.h
lib/libssl/src/demos/easy_tls: easy-tls.c
lib/libssl/src/demos/tunala: autoungunk.sh cb.c configure.in
tunala.c tunala.h
lib/libssl/src/doc: c-indentation.el openssl.txt ssleay.txt
standards.txt
lib/libssl/src/doc/HOWTO: certificates.txt
lib/libssl/src/doc/apps: asn1parse.pod ca.pod ciphers.pod
config.pod dgst.pod enc.pod ocsp.pod
openssl.pod req.pod rsautl.pod
s_client.pod s_server.pod smime.pod
verify.pod x509.pod
lib/libssl/src/doc/crypto: BIO_f_base64.pod BIO_set_callback.pod
BN_add_word.pod BN_new.pod
DH_set_method.pod DSA_set_method.pod
EVP_BytesToKey.pod EVP_DigestInit.pod
EVP_SealInit.pod RAND_bytes.pod
RAND_egd.pod RAND_set_rand_method.pod
RSA_get_ex_new_index.pod
RSA_set_method.pod RSA_sign.pod
bn.pod bn_internal.pod des_modes.pod
md5.pod mdc2.pod ripemd.pod sha.pod
lib/libssl/src/doc/ssl: SSL_CTX_set_options.pod
SSL_CTX_set_tmp_rsa_callback.pod
SSL_CTX_use_certificate.pod
SSL_SESSION_get_time.pod
lib/libssl/src/ms: do_masm.bat do_ms.bat do_nasm.bat do_nt.bat
mingw32.bat test.bat x86asm.bat
lib/libssl/src/shlib: Makefile.hpux10-cc hpux10-cc.sh
lib/libssl/src/ssl: bio_ssl.c install.com kssl.c s23_clnt.c
s23_lib.c s23_meth.c s23_srvr.c s2_clnt.c
s2_enc.c s2_lib.c s2_meth.c s2_srvr.c
s3_both.c s3_clnt.c s3_enc.c s3_lib.c
s3_meth.c s3_pkt.c s3_srvr.c ssl-lib.com
ssl.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_rsa.c ssl_sess.c ssl_stat.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: bctest maketests.com tcrl testca testenc
tests.com tpkcs7 tpkcs7d treq trsa tsid
tx509
lib/libssl/src/util: ck_errf.pl clean-depend.pl cygwin.sh domd
libeay.num mk1mf.pl mkdef.pl mkdir-p.pl
mkerr.pl mkfiles.pl mklink.pl mkstack.pl
ssleay.num
lib/libssl/src/util/pl: BC-32.pl Mingw32.pl OS2-EMX.pl VC-32.pl
linux.pl ultrix.pl unix.pl
Log message:
resolve conflicts
