Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Jul 2006 19:14:51 +0000 (UTC)
From:      "Simon L. Nielsen" <simon@FreeBSD.org>
To:        src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   cvs commit: src/crypto/openssl comm.txt comms.txt src/crypto/openssl/apps der_chop der_chop.in openssl.cnf speed.c src/crypto/openssl/bugs VC16.bug src/crypto/openssl/certs ICE-CA.pem ICE-root.pem ICE-user.pem ICE.crl RegTP-4R.pem ...
Message-ID:  <200607291914.k6TJEpxJ035908@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
simon       2006-07-29 19:14:51 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssl/apps  openssl.cnf speed.c 
    crypto/openssl/crypto/des des.h 
    crypto/openssl/crypto/engine eng_all.c 
    crypto/openssl/crypto/err err_all.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/idea i_skey.c idea.h idea_spd.c 
                               ideatest.c 
    crypto/openssl/crypto/rsa rsa.h rsa_eay.c rsa_lib.c 
    crypto/openssl/ssl   s23_clnt.c s23_lib.c s23_srvr.c s2_clnt.c 
                         s2_enc.c s2_lib.c s2_meth.c s2_srvr.c 
    crypto/openssl/util/pl Mingw32.pl 
  Removed files:
    crypto/openssl       comm.txt comms.txt 
    crypto/openssl/apps  der_chop der_chop.in 
    crypto/openssl/bugs  VC16.bug 
    crypto/openssl/certs ICE-CA.pem ICE-root.pem ICE-user.pem 
                         ICE.crl RegTP-4R.pem ca-cert.pem 
                         dsa-ca.pem dsa-pca.pem factory.pem 
                         nortelCA.pem pca-cert.pem rsa-cca.pem 
                         timCA.pem tjhCA.pem vsign2.pem 
                         vsigntca.pem 
    crypto/openssl/crypto/bn/asm alpha.s alpha.s.works bn-alpha.pl 
                                 ca.pl co-alpha.pl mips1.s 
                                 pa-risc.s r3000.s 
    crypto/openssl/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 
    crypto/openssl/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 
    crypto/openssl/crypto/ec ecp_recp.c 
    crypto/openssl/crypto/engine 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_cryptodev.c 
                                 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 
    crypto/openssl/crypto/engine/vendor_defns aep.h atalla.h 
                                              cswift.h 
                                              hw_4758_cca.h 
                                              hw_ubsec.h 
                                              hwcryptohook.h 
                                              sureware.h 
    crypto/openssl/crypto/perlasm alpha.pl 
    crypto/openssl/test  testfipsssl 
    crypto/openssl/util/pl BC-16.pl VC-16.pl VC-CE.pl 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.8b.
  
  Revision  Changes    Path
  1.2       +0 -305    src/crypto/openssl/apps/der_chop (dead)
  1.2       +0 -305    src/crypto/openssl/apps/der_chop.in (dead)
  1.8       +58 -5     src/crypto/openssl/apps/openssl.cnf
  1.14      +794 -20   src/crypto/openssl/apps/speed.c
  1.2       +0 -18     src/crypto/openssl/bugs/VC16.bug (dead)
  1.2       +0 -59     src/crypto/openssl/certs/ICE-CA.pem (dead)
  1.2       +0 -48     src/crypto/openssl/certs/ICE-root.pem (dead)
  1.2       +0 -63     src/crypto/openssl/certs/ICE-user.pem (dead)
  1.2       +0 -9      src/crypto/openssl/certs/ICE.crl (dead)
  1.2       +0 -19     src/crypto/openssl/certs/RegTP-4R.pem (dead)
  1.2       +0 -31     src/crypto/openssl/certs/ca-cert.pem (dead)
  1.2       +0 -43     src/crypto/openssl/certs/dsa-ca.pem (dead)
  1.2       +0 -49     src/crypto/openssl/certs/dsa-pca.pem (dead)
  1.2       +0 -15     src/crypto/openssl/certs/factory.pem (dead)
  1.2       +0 -16     src/crypto/openssl/certs/nortelCA.pem (dead)
  1.2       +0 -31     src/crypto/openssl/certs/pca-cert.pem (dead)
  1.2       +0 -19     src/crypto/openssl/certs/rsa-cca.pem (dead)
  1.2       +0 -16     src/crypto/openssl/certs/timCA.pem (dead)
  1.2       +0 -15     src/crypto/openssl/certs/tjhCA.pem (dead)
  1.2       +0 -18     src/crypto/openssl/certs/vsign2.pem (dead)
  1.2       +0 -18     src/crypto/openssl/certs/vsigntca.pem (dead)
  1.2       +0 -1      src/crypto/openssl/comm.txt (dead)
  1.2       +0 -1      src/crypto/openssl/comms.txt (dead)
  1.2       +0 -1898   src/crypto/openssl/crypto/bn/asm/alpha.s (dead)
  1.2       +0 -533    src/crypto/openssl/crypto/bn/asm/alpha.s.works (dead)
  1.2       +0 -119    src/crypto/openssl/crypto/bn/asm/alpha.works/add.pl (dead)
  1.2       +0 -144    src/crypto/openssl/crypto/bn/asm/alpha.works/div.pl (dead)
  1.2       +0 -116    src/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl (dead)
  1.2       +0 -120    src/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl (dead)
  1.2       +0 -213    src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl (dead)
  1.2       +0 -98     src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl (dead)
  1.2       +0 -177    src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl (dead)
  1.2       +0 -113    src/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl (dead)
  1.2       +0 -109    src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl (dead)
  1.2       +0 -132    src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl (dead)
  1.2       +0 -108    src/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl (dead)
  1.2       +0 -118    src/crypto/openssl/crypto/bn/asm/alpha/add.pl (dead)
  1.2       +0 -144    src/crypto/openssl/crypto/bn/asm/alpha/div.pl (dead)
  1.2       +0 -104    src/crypto/openssl/crypto/bn/asm/alpha/mul.pl (dead)
  1.2       +0 -123    src/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl (dead)
  1.2       +0 -215    src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl (dead)
  1.2       +0 -98     src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl (dead)
  1.2       +0 -177    src/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl (dead)
  1.2       +0 -113    src/crypto/openssl/crypto/bn/asm/alpha/sqr.pl (dead)
  1.2       +0 -109    src/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl (dead)
  1.2       +0 -132    src/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl (dead)
  1.2       +0 -108    src/crypto/openssl/crypto/bn/asm/alpha/sub.pl (dead)
  1.2       +0 -571    src/crypto/openssl/crypto/bn/asm/bn-alpha.pl (dead)
  1.2       +0 -33     src/crypto/openssl/crypto/bn/asm/ca.pl (dead)
  1.2       +0 -116    src/crypto/openssl/crypto/bn/asm/co-alpha.pl (dead)
  1.2       +0 -539    src/crypto/openssl/crypto/bn/asm/mips1.s (dead)
  1.2       +0 -710    src/crypto/openssl/crypto/bn/asm/pa-risc.s (dead)
  1.2       +0 -646    src/crypto/openssl/crypto/bn/asm/r3000.s (dead)
  1.11      +4 -4      src/crypto/openssl/crypto/des/des.h
  1.2       +0 -133    src/crypto/openssl/crypto/ec/ecp_recp.c (dead)
  1.3       +17 -13    src/crypto/openssl/crypto/engine/eng_all.c
  1.2       +0 -8      src/crypto/openssl/crypto/engine/hw.ec (dead)
  1.2       +0 -969    src/crypto/openssl/crypto/engine/hw_4758_cca.c (dead)
  1.2       +0 -149    src/crypto/openssl/crypto/engine/hw_4758_cca_err.c (dead)
  1.2       +0 -93     src/crypto/openssl/crypto/engine/hw_4758_cca_err.h (dead)
  1.2       +0 -1119   src/crypto/openssl/crypto/engine/hw_aep.c (dead)
  1.2       +0 -157    src/crypto/openssl/crypto/engine/hw_aep_err.c (dead)
  1.2       +0 -101    src/crypto/openssl/crypto/engine/hw_aep_err.h (dead)
  1.2       +0 -594    src/crypto/openssl/crypto/engine/hw_atalla.c (dead)
  1.2       +0 -145    src/crypto/openssl/crypto/engine/hw_atalla_err.c (dead)
  1.2       +0 -89     src/crypto/openssl/crypto/engine/hw_atalla_err.h (dead)
  1.2       +0 -1130   src/crypto/openssl/crypto/engine/hw_cryptodev.c (dead)
  1.2       +0 -997    src/crypto/openssl/crypto/engine/hw_cswift.c (dead)
  1.2       +0 -149    src/crypto/openssl/crypto/engine/hw_cswift_err.c (dead)
  1.2       +0 -93     src/crypto/openssl/crypto/engine/hw_cswift_err.h (dead)
  1.2       +0 -1388   src/crypto/openssl/crypto/engine/hw_ncipher.c (dead)
  1.2       +0 -157    src/crypto/openssl/crypto/engine/hw_ncipher_err.c (dead)
  1.2       +0 -101    src/crypto/openssl/crypto/engine/hw_ncipher_err.h (dead)
  1.2       +0 -418    src/crypto/openssl/crypto/engine/hw_nuron.c (dead)
  1.2       +0 -142    src/crypto/openssl/crypto/engine/hw_nuron_err.c (dead)
  1.2       +0 -86     src/crypto/openssl/crypto/engine/hw_nuron_err.h (dead)
  1.2       +0 -1039   src/crypto/openssl/crypto/engine/hw_sureware.c (dead)
  1.2       +0 -150    src/crypto/openssl/crypto/engine/hw_sureware_err.c (dead)
  1.2       +0 -94     src/crypto/openssl/crypto/engine/hw_sureware_err.h (dead)
  1.2       +0 -1061   src/crypto/openssl/crypto/engine/hw_ubsec.c (dead)
  1.2       +0 -151    src/crypto/openssl/crypto/engine/hw_ubsec_err.c (dead)
  1.2       +0 -95     src/crypto/openssl/crypto/engine/hw_ubsec_err.h (dead)
  1.2       +0 -178    src/crypto/openssl/crypto/engine/vendor_defns/aep.h (dead)
  1.2       +0 -48     src/crypto/openssl/crypto/engine/vendor_defns/atalla.h (dead)
  1.2       +0 -234    src/crypto/openssl/crypto/engine/vendor_defns/cswift.h (dead)
  1.2       +0 -149    src/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h (dead)
  1.2       +0 -100    src/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h (dead)
  1.2       +0 -486    src/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h (dead)
  1.2       +0 -239    src/crypto/openssl/crypto/engine/vendor_defns/sureware.h (dead)
  1.9       +13 -4     src/crypto/openssl/crypto/err/err_all.c
  1.15      +107 -96   src/crypto/openssl/crypto/evp/evp.h
  1.7       +3 -2      src/crypto/openssl/crypto/idea/i_skey.c
  1.7       +3 -2      src/crypto/openssl/crypto/idea/idea.h
  1.6       +3 -0      src/crypto/openssl/crypto/idea/idea_spd.c
  1.6       +3 -0      src/crypto/openssl/crypto/idea/ideatest.c
  1.2       +0 -434    src/crypto/openssl/crypto/perlasm/alpha.pl (dead)
  1.12      +91 -28    src/crypto/openssl/crypto/rsa/rsa.h
  1.14      +319 -286  src/crypto/openssl/crypto/rsa/rsa_eay.c
  1.11      +86 -36    src/crypto/openssl/crypto/rsa/rsa_lib.c
  1.9       +169 -80   src/crypto/openssl/ssl/s23_clnt.c
  1.7       +12 -50    src/crypto/openssl/ssl/s23_lib.c
  1.9       +5 -23     src/crypto/openssl/ssl/s23_srvr.c
  1.14      +12 -30    src/crypto/openssl/ssl/s2_clnt.c
  1.10      +1 -1      src/crypto/openssl/ssl/s2_enc.c
  1.11      +40 -89    src/crypto/openssl/ssl/s2_lib.c
  1.6       +4 -22     src/crypto/openssl/ssl/s2_meth.c
  1.13      +15 -31    src/crypto/openssl/ssl/s2_srvr.c
  1.2       +0 -113    src/crypto/openssl/test/testfipsssl (dead)
  1.2       +0 -146    src/crypto/openssl/util/pl/BC-16.pl (dead)
  1.8       +5 -10     src/crypto/openssl/util/pl/Mingw32.pl
  1.2       +0 -173    src/crypto/openssl/util/pl/VC-16.pl (dead)
  1.2       +0 -111    src/crypto/openssl/util/pl/VC-CE.pl (dead)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607291914.k6TJEpxJ035908>