CVSROOT:        /cvs
Module name:    src
Changes by:     [email protected]    2011/11/02 20:34:33

Modified files:
        lib/libssl/src : CHANGES Configure FAQ INSTALL.VMS INSTALL.W32 
                         LICENSE Makefile Makefile.shared NEWS PROBLEMS 
                         README config install.com makevms.com 
                         openssl.spec 
        lib/libssl/src/VMS: mkshared.com 
        lib/libssl/src/apps: CA.com apps.c asn1pars.c dh.c dhparam.c 
                             dsaparam.c enc.c gendh.c gendsa.c 
                             makeapps.com openssl.c pkcs12.c pkcs7.c 
                             rand.c s_server.c s_socket.c speed.c x509.c 
        lib/libssl/src/crypto: Makefile cryptlib.c crypto-lib.com 
                               md32_common.h o_time.c opensslv.h 
        lib/libssl/src/crypto/asn1: a_int.c a_object.c a_strex.c 
                                    a_strnid.c asn1.h n_pkey.c t_crl.c 
                                    tasn_dec.c x_name.c x_x509.c 
        lib/libssl/src/crypto/bio: b_sock.c bf_nbio.c bio_lib.c 
                                   bss_acpt.c bss_dgram.c bss_file.c 
                                   bss_log.c 
        lib/libssl/src/crypto/bn: bn.h bn_exp2.c bn_gf2m.c bn_mont.c 
                                  bn_mul.c bn_nist.c 
        lib/libssl/src/crypto/comp: c_rle.c 
        lib/libssl/src/crypto/conf: conf_api.c conf_def.c 
        lib/libssl/src/crypto/dsa: dsa_gen.c dsa_ossl.c 
        lib/libssl/src/crypto/dso: dso_dlfcn.c dso_vms.c 
        lib/libssl/src/crypto/ec: ec2_smpl.c ec_mult.c ecp_smpl.c 
        lib/libssl/src/crypto/engine: engine.h 
        lib/libssl/src/crypto/evp: encode.c evp_enc.c evp_test.c p_lib.c 
                                   p_sign.c p_verify.c 
        lib/libssl/src/crypto/hmac: hmac.c 
        lib/libssl/src/crypto/ocsp: ocsp_ht.c ocsp_lib.c ocsp_prn.c 
        lib/libssl/src/crypto/pem: pem_lib.c 
        lib/libssl/src/crypto/perlasm: cbc.pl x86_64-xlate.pl 
        lib/libssl/src/crypto/pkcs12: p12_key.c 
        lib/libssl/src/crypto/pkcs7: pk7_doit.c pk7_lib.c 
        lib/libssl/src/crypto/rand: md_rand.c rand_vms.c randfile.c 
        lib/libssl/src/crypto/rsa: rsa_eay.c rsa_oaep.c 
        lib/libssl/src/crypto/stack: safestack.h 
        lib/libssl/src/crypto/x509: x509.h x509_vfy.c x_all.c 
        lib/libssl/src/crypto/x509v3: pcy_tree.c v3_addr.c v3_asid.c 
        lib/libssl/src/doc/apps: smime.pod 
        lib/libssl/src/doc/ssl: SSL_CTX_set_options.pod ssl.pod 
        lib/libssl/src/engines: Makefile e_capi.c e_capi_err.h e_gmp.c 
                                e_ubsec.c 
        lib/libssl/src/ssl: bio_ssl.c d1_clnt.c d1_pkt.c d1_srvr.c 
                            s23_lib.c s2_srvr.c s3_clnt.c s3_enc.c 
                            s3_lib.c s3_pkt.c s3_srvr.c ssl-lib.com 
                            ssl_asn1.c ssl_ciph.c ssl_lib.c ssltest.c 
                            t1_enc.c t1_lib.c 
        lib/libssl/src/test: maketests.com tcrl.com testca.com 
                             testenc.com testgen.com tests.com 
                             testss.com testssl.com tpkcs7.com 
                             tpkcs7d.com treq.com trsa.com tsid.com 
                             tverify.com tx509.com 
        lib/libssl/src/util: cygwin.sh libeay.num mk1mf.pl mkdef.pl 
                             mkerr.pl mkstack.pl 
        lib/libssl/src/util/pl: VC-32.pl 

Log message:
openssl-1.0.0e: resolve conflicts

Reply via email to