CVSROOT:        /cvs
Module name:    src
Changes by:     d...@cvs.openbsd.org    2010/10/01 16:59:01

Modified files:
        lib/libssl/src : CHANGES CHANGES.SSLeay Configure FAQ INSTALL 
                         INSTALL.W32 Makefile Makefile.org 
                         Makefile.shared NEWS README config e_os.h 
                         e_os2.h install.com makevms.com openssl.spec 
        lib/libssl/src/VMS: install.com mkshared.com openssl_utils.com 
        lib/libssl/src/apps: CA.com CA.sh Makefile apps.c apps.h 
                             asn1pars.c ca.c ciphers.c crl2p7.c dgst.c 
                             dh.c dhparam.c dsa.c dsaparam.c enc.c 
                             engine.c errstr.c gendh.c gendsa.c genrsa.c 
                             install.com makeapps.com ocsp.c 
                             openssl-vms.cnf openssl.c openssl.cnf 
                             pkcs12.c pkcs7.c pkcs8.c progs.h progs.pl 
                             req.c rsa.c rsautl.c s_apps.h s_cb.c 
                             s_client.c s_server.c s_socket.c s_time.c 
                             smime.c speed.c tsget verify.c x509.c 
        lib/libssl/src/crypto: cpt_err.c cryptlib.c crypto-lib.com 
                               crypto.h ex_data.c install.com 
                               md32_common.h mem.c mem_dbg.c o_time.c 
                               o_time.h opensslconf.h.in opensslv.h 
                               ossl_typ.h symhacks.h x86_64cpuid.pl 
        lib/libssl/src/crypto/aes: aes.h aes_cbc.c aes_cfb.c aes_core.c 
                                   aes_ctr.c aes_ofb.c 
        lib/libssl/src/crypto/aes/asm: aes-586.pl aes-x86_64.pl 
        lib/libssl/src/crypto/asn1: a_bitstr.c a_dup.c a_gentm.c a_int.c 
                                    a_mbstr.c a_object.c a_octet.c 
                                    a_set.c a_sign.c a_strnid.c a_time.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_mime.c 
                                    asn_pack.c charmap.h d2i_pr.c 
                                    d2i_pu.c i2d_pr.c nsseq.c p5_pbe.c 
                                    p5_pbev2.c p8_pkey.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_prn.c tasn_typ.c x_crl.c 
                                    x_long.c x_name.c x_pubkey.c x_req.c 
                                    x_x509.c 
        lib/libssl/src/crypto/bf: bf_skey.c blowfish.h 
        lib/libssl/src/crypto/bf/asm: bf-586.pl 
        lib/libssl/src/crypto/bio: b_print.c b_sock.c bio.h bio_cb.c 
                                   bio_err.c bio_lib.c bss_acpt.c 
                                   bss_dgram.c bss_fd.c bss_file.c 
                                   bss_log.c bss_mem.c bss_sock.c 
        lib/libssl/src/crypto/bn: Makefile bn.h bn_asm.c bn_blind.c 
                                  bn_ctx.c bn_div.c bn_exp.c bn_gf2m.c 
                                  bn_lcl.h bn_lib.c bn_mont.c bn_mul.c 
                                  bn_print.c bntest.c exptest.c 
        lib/libssl/src/crypto/bn/asm: bn-586.pl co-586.pl sparcv8plus.S 
        lib/libssl/src/crypto/buffer: buf_err.c buffer.c buffer.h 
        lib/libssl/src/crypto/cast: c_cfb64.c c_ecb.c c_enc.c c_ofb64.c 
                                    c_skey.c cast.h 
        lib/libssl/src/crypto/cast/asm: cast-586.pl 
        lib/libssl/src/crypto/cms: cms_smime.c 
        lib/libssl/src/crypto/comp: c_zlib.c comp_err.c 
        lib/libssl/src/crypto/conf: README conf.h conf_api.c conf_def.c 
                                    conf_err.c conf_lib.c conf_mall.c 
                                    conf_mod.c 
        lib/libssl/src/crypto/des: des-lib.com des_enc.c des_locl.h 
                                   ecb_enc.c enc_read.c enc_writ.c 
                                   fcrypt_b.c rpc_des.h set_key.c 
                                   xcbc_enc.c 
        lib/libssl/src/crypto/des/asm: crypt586.pl des-586.pl 
        lib/libssl/src/crypto/des/times: aix.cc 
        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 
                                   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_openssl.c 
                                   dso_vms.c dso_win32.c 
        lib/libssl/src/crypto/ec: ec.h ec2_smpl.c ec_err.c ec_lcl.h 
                                  ec_lib.c ec_mult.c ecp_nist.c ectest.c 
        lib/libssl/src/crypto/ecdh: Makefile 
        lib/libssl/src/crypto/ecdsa: Makefile 
        lib/libssl/src/crypto/engine: Makefile eng_all.c eng_cnf.c 
                                      eng_cryptodev.c eng_ctrl.c 
                                      eng_dyn.c eng_err.c eng_fat.c 
                                      eng_int.h eng_lib.c eng_list.c 
                                      eng_openssl.c eng_table.c engine.h 
                                      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_b64.c bio_enc.c bio_md.c 
                                   c_all.c c_allc.c c_alld.c digest.c 
                                   e_aes.c e_des.c e_des3.c e_idea.c 
                                   e_null.c e_rc2.c e_rc4.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 
                                   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_dec.c 
                                   p_enc.c p_lib.c p_open.c p_seal.c 
                                   p_sign.c p_verify.c 
        lib/libssl/src/crypto/hmac: hmac.c hmac.h 
        lib/libssl/src/crypto/idea: idea.h 
        lib/libssl/src/crypto/lhash: lh_stats.c lhash.c lhash.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 md5_locl.h 
        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.pl objects.txt 
        lib/libssl/src/crypto/ocsp: ocsp.h 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_pkey.c pem_seal.c 
                                   pem_x509.c pem_xaux.c 
        lib/libssl/src/crypto/perlasm: x86_64-xlate.pl x86asm.pl 
                                       x86gas.pl x86nasm.pl 
        lib/libssl/src/crypto/pkcs12: p12_add.c p12_attr.c p12_crpt.c 
                                      p12_crt.c p12_key.c p12_kiss.c 
                                      p12_mutl.c p12_npas.c p12_utl.c 
                                      pk12err.c pkcs12.h 
        lib/libssl/src/crypto/pkcs7: 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: Makefile md_rand.c rand.h rand_egd.c 
                                    rand_err.c rand_lcl.h rand_lib.c 
                                    rand_os2.c rand_unix.c rand_win.c 
                                    randfile.c 
        lib/libssl/src/crypto/rc2: rc2.h rc2_skey.c 
        lib/libssl/src/crypto/rc4: rc4.h rc4_enc.c rc4_skey.c rc4test.c 
        lib/libssl/src/crypto/rc4/asm: rc4-586.pl 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/ripemd/asm: rmd-586.pl 
        lib/libssl/src/crypto/rsa: Makefile rsa.h rsa_asn1.c rsa_eay.c 
                                   rsa_err.c rsa_gen.c rsa_lib.c 
                                   rsa_oaep.c rsa_sign.c rsa_test.c 
        lib/libssl/src/crypto/sha: sha.h sha1_one.c sha1dgst.c 
                                   sha_dgst.c sha_locl.h 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 pthreads-vms.com 
        lib/libssl/src/crypto/ts: ts_rsp_verify.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_openssl.c 
        lib/libssl/src/crypto/x509: by_dir.c by_file.c x509.h x509_cmp.c 
                                    x509_err.c x509_lu.c x509_obj.c 
                                    x509_req.c x509_set.c x509_trs.c 
                                    x509_txt.c x509_vfy.c x509_vfy.h 
                                    x509cset.c x509name.c x509type.c 
                                    x_all.c 
        lib/libssl/src/crypto/x509v3: ext_dat.h pcy_data.c pcy_tree.c 
                                      v3_addr.c v3_alt.c v3_asid.c 
                                      v3_conf.c v3_cpols.c v3_crld.c 
                                      v3_enum.c v3_extku.c v3_genn.c 
                                      v3_lib.c v3_ocsp.c v3_prn.c 
                                      v3_purp.c v3_utl.c v3err.c 
                                      x509v3.h 
        lib/libssl/src/demos/easy_tls: Makefile cacerts.pem cert.pem 
                                       easy-tls.c easy-tls.h test.c 
                                       test.h 
        lib/libssl/src/demos/pkcs12: pkread.c 
        lib/libssl/src/demos/tunala: autoungunk.sh cb.c tunala.c 
        lib/libssl/src/demos/x509: mkcert.c mkreq.c 
        lib/libssl/src/doc: ssleay.txt standards.txt 
        lib/libssl/src/doc/apps: asn1parse.pod ca.pod ciphers.pod 
                                 dgst.pod dhparam.pod dsa.pod 
                                 dsaparam.pod enc.pod gendsa.pod 
                                 genrsa.pod ocsp.pod openssl.pod 
                                 pkcs12.pod pkcs7.pod pkcs8.pod req.pod 
                                 rsa.pod s_client.pod s_server.pod 
                                 smime.pod speed.pod spkac.pod 
                                 verify.pod x509.pod 
        lib/libssl/src/doc/crypto: BIO_f_buffer.pod BIO_f_md.pod 
                                   BIO_f_ssl.pod BIO_s_file.pod 
                                   BIO_s_mem.pod BIO_should_retry.pod 
                                   CRYPTO_set_ex_data.pod 
                                   DSA_get_ex_new_index.pod 
                                   EVP_DigestInit.pod EVP_SignInit.pod 
                                   EVP_VerifyInit.pod bn_internal.pod 
                                   d2i_RSAPublicKey.pod evp.pod hmac.pod 
                                   lhash.pod pem.pod threads.pod 
                                   ui_compat.pod 
        lib/libssl/src/doc/ssl: SSL_CIPHER_get_name.pod SSL_CTX_new.pod 
                                SSL_CTX_set_mode.pod 
                                SSL_CTX_set_options.pod 
                                SSL_CTX_set_ssl_version.pod 
                                SSL_library_init.pod ssl.pod 
        lib/libssl/src/engines: Makefile e_capi.c e_capi_err.c 
                                e_capi_err.h e_gmp.c e_ubsec.c 
        lib/libssl/src/engines/vendor_defns: hwcryptohook.h 
        lib/libssl/src/ms: bcb4.bat do_ms.bat do_nasm.bat do_nt.bat 
                           mingw32.bat mw.bat tenc.bat test.bat 
                           testenc.bat testpem.bat testss.bat tpem.bat 
                           x86asm.bat 
        lib/libssl/src/ssl: Makefile bio_ssl.c d1_clnt.c d1_pkt.c 
                            d1_srvr.c dtls1.h install.com kssl.c 
                            kssl_lcl.h 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_pkt.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: CAss.cnf Makefile Uss.cnf maketests.com 
                             tcrl.com testca.com testenc.com testgen.com 
                             tests.com testss.com testssl testssl.com 
                             times tpkcs7.com tpkcs7d.com treq.com 
                             trsa.com tsid.com tverify.com tx509.com 
        lib/libssl/src/times: aix.t 
        lib/libssl/src/times/x86: des3s.cpp 
        lib/libssl/src/tools: c_rehash.in 
        lib/libssl/src/util: ck_errf.pl clean-depend.pl copy.pl 
                             cygwin.sh domd libeay.num mk1mf.pl mkdef.pl 
                             mkerr.pl mkfiles.pl mklink.pl mkstack.pl 
                             pod2man.pl point.sh selftest.pl ssleay.num 
        lib/libssl/src/util/pl: BC-32.pl Mingw32.pl VC-32.pl 
Removed files:
        lib/libssl/src : ChangeLog.0_9_7-stable_not-in-head 
                         ChangeLog.0_9_7-stable_not-in-head_FIPS 
        lib/libssl/src/apps: Makefile.ssl der_chop.in 
        lib/libssl/src/bugs: VC16.bug 
        lib/libssl/src/certs: ICE-CA.pem ICE-root.pem ICE-user.pem 
                              ICE.crl RegTP-4R.pem RegTP-5R.pem 
                              RegTP-6R.pem argena.pem argeng.pem 
                              ca-cert.pem dsa-ca.pem dsa-pca.pem 
                              eng1.pem eng2.pem eng3.pem eng4.pem 
                              eng5.pem factory.pem nortelCA.pem 
                              pca-cert.pem rsa-cca.pem thawteCb.pem 
                              thawteCp.pem timCA.pem tjhCA.pem 
                              vsign1.pem vsign2.pem vsign3.pem 
                              vsignss.pem vsigntca.pem wellsfgo.pem 
        lib/libssl/src/certs/demo: nortelCA.pem timCA.pem tjhCA.pem 
                                   vsigntca.pem 
        lib/libssl/src/certs/expired: ICE-CA.pem ICE-root.pem 
                                      ICE-user.pem RegTP-4R.pem 
                                      factory.pem rsa-cca.pem 
                                      rsa-ssca.pem vsign2.pem vsign3.pem 
        lib/libssl/src/crypto: Makefile.ssl dyn_lck.c fips_err.c 
                               fips_err.h o_init.c tmdiff.c tmdiff.h 
        lib/libssl/src/crypto/aes: Makefile.ssl 
        lib/libssl/src/crypto/asn1: Makefile.ssl a_hdr.c a_meth.c f.c 
                                    p8_key.c x_cinf.c 
        lib/libssl/src/crypto/bf: Makefile.ssl 
        lib/libssl/src/crypto/bio: Makefile.ssl 
        lib/libssl/src/crypto/bn: Makefile.ssl bn_opt.c bn_x931p.c 
        lib/libssl/src/crypto/bn/asm: alpha.s alpha.s.works bn-alpha.pl 
                                      ca.pl co-alpha.pl mips1.s 
                                      mo-586.pl pa-risc.s r3000.s 
        lib/libssl/src/crypto/bn/asm/alpha: add.pl div.pl mul.pl 
                                            mul_add.pl mul_c4.pl 
                                            mul_c4.works.pl mul_c8.pl 
                                            sqr.pl sqr_c4.pl sqr_c8.pl 
                                            sub.pl 
        lib/libssl/src/crypto/bn/asm/alpha.works: add.pl div.pl mul.pl 
                                                  mul_add.pl mul_c4.pl 
                                                  mul_c4.works.pl 
                                                  mul_c8.pl sqr.pl 
                                                  sqr_c4.pl sqr_c8.pl 
                                                  sub.pl 
        lib/libssl/src/crypto/buffer: Makefile.ssl buf_str.c 
        lib/libssl/src/crypto/cast: Makefile.ssl 
        lib/libssl/src/crypto/comp: Makefile.ssl 
        lib/libssl/src/crypto/conf: Makefile.ssl 
        lib/libssl/src/crypto/des: Makefile.ssl des_lib.c 
        lib/libssl/src/crypto/des/asm: des686.pl 
        lib/libssl/src/crypto/dh: Makefile.ssl 
        lib/libssl/src/crypto/dsa: Makefile.ssl dsa_utl.c 
        lib/libssl/src/crypto/dso: Makefile.ssl 
        lib/libssl/src/crypto/ec: Makefile.ssl ec2_smpt.c ecp_recp.c 
        lib/libssl/src/crypto/engine: Makefile.ssl hw.ec hw_4758_cca.c 
                                      hw_4758_cca_err.c 
                                      hw_4758_cca_err.h hw_aep.c 
                                      hw_aep_err.c hw_aep_err.h 
                                      hw_atalla.c hw_atalla_err.c 
                                      hw_atalla_err.h hw_cswift.c 
                                      hw_cswift_err.c hw_cswift_err.h 
                                      hw_ncipher.c hw_ncipher_err.c 
                                      hw_ncipher_err.h hw_nuron.c 
                                      hw_nuron_err.c hw_nuron_err.h 
                                      hw_sureware.c hw_sureware_err.c 
                                      hw_sureware_err.h hw_ubsec.c 
                                      hw_ubsec_err.c hw_ubsec_err.h 
        lib/libssl/src/crypto/engine/vendor_defns: aep.h atalla.h 
                                                   cswift.h 
                                                   hw_4758_cca.h 
                                                   hw_ubsec.h 
                                                   hwcryptohook.h 
                                                   sureware.h 
        lib/libssl/src/crypto/err: Makefile.ssl err_bio.c err_def.c 
                                   err_str.c 
        lib/libssl/src/crypto/evp: Makefile.ssl dig_eng.c enc_min.c 
                                   evp_cnf.c 
        lib/libssl/src/crypto/hmac: Makefile.ssl 
        lib/libssl/src/crypto/idea: Makefile.ssl 
        lib/libssl/src/crypto/krb5: Makefile.ssl 
        lib/libssl/src/crypto/lhash: Makefile.ssl 
        lib/libssl/src/crypto/md2: Makefile.ssl 
        lib/libssl/src/crypto/md4: Makefile.ssl 
        lib/libssl/src/crypto/md5: Makefile.ssl 
        lib/libssl/src/crypto/md5/asm: md5-sparcv9.S 
        lib/libssl/src/crypto/mdc2: Makefile.ssl 
        lib/libssl/src/crypto/objects: Makefile.ssl 
        lib/libssl/src/crypto/ocsp: Makefile.ssl 
        lib/libssl/src/crypto/pem: Makefile.ssl 
        lib/libssl/src/crypto/perlasm: alpha.pl x86ms.pl x86unix.pl 
        lib/libssl/src/crypto/pkcs12: Makefile.ssl 
        lib/libssl/src/crypto/pkcs7: Makefile.ssl 
        lib/libssl/src/crypto/pqueue: pq_compat.h 
        lib/libssl/src/crypto/rand: Makefile.ssl rand_eng.c 
        lib/libssl/src/crypto/rc2: Makefile.ssl 
        lib/libssl/src/crypto/rc4: Makefile.ssl rc4_fblk.c 
        lib/libssl/src/crypto/rc4/asm: rc4-amd64.pl rc4-ia64.S 
        lib/libssl/src/crypto/rc5: Makefile.ssl 
        lib/libssl/src/crypto/ripemd: Makefile.ssl 
        lib/libssl/src/crypto/rsa: Makefile.ssl rsa_eng.c rsa_x931g.c 
        lib/libssl/src/crypto/sha: Makefile.ssl sha1s.cpp 
        lib/libssl/src/crypto/sha/asm: sha512-sse2.pl 
        lib/libssl/src/crypto/stack: Makefile.ssl 
        lib/libssl/src/crypto/txt_db: Makefile.ssl 
        lib/libssl/src/crypto/ui: Makefile.ssl 
        lib/libssl/src/crypto/x509: Makefile.ssl 
        lib/libssl/src/crypto/x509v3: Makefile.ssl 
        lib/libssl/src/demos/jpake: Makefile jpakedemo.c 
        lib/libssl/src/fips: Makefile fingerprint.sha1 fips-lib.com 
                             fips-nodiff.txt fips.c fips.h 
                             fips_canister.c fips_check_sha1 fips_err.h 
                             fips_err_wrapper.c fips_locl.h 
                             fips_make_sha1 fips_premain.c 
                             fips_premain.c.sha1 fips_test_suite.c 
                             fips_utl.h fipsalgtest.pl fipsld 
                             fipstests.bat fipstests.sh install.com 
                             mkfipsscr.pl openssl_fips_fingerprint 
        lib/libssl/src/fips/aes: Makefile fingerprint.sha1 
                                 fips_aes_core.c fips_aes_locl.h 
                                 fips_aes_selftest.c fips_aesavs.c 
        lib/libssl/src/fips/des: Makefile fingerprint.sha1 
                                 fips_des_enc.c fips_des_locl.h 
                                 fips_des_selftest.c fips_desmovs.c 
                                 fips_set_key.c 
        lib/libssl/src/fips/des/asm: fips-dx86-elf.s 
        lib/libssl/src/fips/dh: Makefile dh_gen.c fingerprint.sha1 
                                fips_dh_check.c fips_dh_gen.c 
                                fips_dh_key.c fips_dh_lib.c 
        lib/libssl/src/fips/dsa: Makefile fingerprint.sha1 
                                 fips_dsa_gen.c fips_dsa_key.c 
                                 fips_dsa_lib.c fips_dsa_ossl.c 
                                 fips_dsa_selftest.c fips_dsa_sign.c 
                                 fips_dsatest.c fips_dssvs.c 
        lib/libssl/src/fips/hmac: Makefile fips_hmac.c 
                                  fips_hmac_selftest.c fips_hmactest.c 
        lib/libssl/src/fips/rand: Makefile fingerprint.sha1 fips_rand.c 
                                  fips_rand.h fips_rand_selftest.c 
                                  fips_randtest.c fips_rngvs.c 
        lib/libssl/src/fips/rsa: Makefile fingerprint.sha1 
                                 fips_rsa_eay.c fips_rsa_gen.c 
                                 fips_rsa_lib.c fips_rsa_selftest.c 
                                 fips_rsa_sign.c fips_rsa_x931g.c 
                                 fips_rsagtest.c fips_rsastest.c 
                                 fips_rsavtest.c 
        lib/libssl/src/fips/sha: Makefile fips_sha1_selftest.c 
                                 fips_shatest.c fips_standalone_sha1.c 
        lib/libssl/src/fips/sha1: Makefile fingerprint.sha1 
                                  fips_md32_common.h 
                                  fips_sha1_selftest.c fips_sha1dgst.c 
                                  fips_sha1test.c fips_sha_locl.h 
                                  fips_standalone_sha1.c sha1hashes.txt 
                                  sha1vectors.txt standalone.sha1 
        lib/libssl/src/fips/sha1/asm: sx86-elf.s 
        lib/libssl/src/fips-1.0: Makefile fips-lib.com fips.c fips.h 
                                 fips_canister.c fips_err.h 
                                 fips_err_wrapper.c fips_locl.h 
                                 fips_premain.c fips_test_suite.c 
                                 fipshashes.c fipsld install.com 
                                 openssl_fips_fingerprint 
        lib/libssl/src/fips-1.0/aes: Makefile fips_aes_core.c 
                                     fips_aes_locl.h fips_aes_selftest.c 
                                     fips_aesavs.c 
        lib/libssl/src/fips-1.0/aes/asm: fips-ax86-elf.s 
        lib/libssl/src/fips-1.0/des: Makefile fips_des_enc.c 
                                     fips_des_locl.h fips_des_selftest.c 
                                     fips_desmovs.c fips_set_key.c 
        lib/libssl/src/fips-1.0/des/asm: fips-dx86-elf.s 
        lib/libssl/src/fips-1.0/dh: Makefile fips_dh_check.c 
                                    fips_dh_gen.c fips_dh_key.c 
        lib/libssl/src/fips-1.0/dsa: Makefile fips_dsa_gen.c 
                                     fips_dsa_ossl.c fips_dsa_selftest.c 
                                     fips_dsatest.c fips_dssvs.c 
        lib/libssl/src/fips-1.0/hmac: Makefile fips_hmac.c 
                                      fips_hmac_selftest.c 
                                      fips_hmactest.c 
        lib/libssl/src/fips-1.0/rand: Makefile fips_rand.c fips_rand.h 
                                      fips_rand_selftest.c 
                                      fips_randtest.c fips_rngvs.c 
        lib/libssl/src/fips-1.0/rsa: Makefile fips_rsa_eay.c 
                                     fips_rsa_gen.c fips_rsa_selftest.c 
                                     fips_rsa_x931g.c fips_rsagtest.c 
                                     fips_rsastest.c fips_rsavtest.c 
        lib/libssl/src/fips-1.0/sha: Makefile SHAmix.fax SHAmix.req 
                                     fips_md32_common.h fips_sha.h 
                                     fips_sha1_selftest.c 
                                     fips_sha1dgst.c fips_sha256.c 
                                     fips_sha512.c fips_sha_locl.h 
                                     fips_shatest.c 
                                     fips_standalone_sha1.c 
        lib/libssl/src/fips-1.0/sha/asm: fips-sx86-elf.s 
        lib/libssl/src/ms: 16all.bat do_fips.bat do_masm.bat 
                           fipscheck.pl segrenam.pl speed16.bat 
        lib/libssl/src/ssl: Makefile.ssl 
        lib/libssl/src/test: Makefile.ssl SHAmix.fax SHAmix.r SHAmix.req 
                             SHAmix.x enginetest.c md4test.c rsa_test.c 
                             sha1hashes.txt sha1vectors.txt testfipsssl 
        lib/libssl/src/tools: Makefile.ssl 
        lib/libssl/src/util: arx.pl checkhash.pl fipslink.pl mksdef.pl 
        lib/libssl/src/util/pl: BC-16.pl VC-16.pl VC-32-GMAKE.pl 
                                VC-CE.pl 

Log message:
resolve conflicts, fix local changes

Reply via email to