cvs commit: src/crypto/openssl/apps openssl.cnf speed.c src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/idea Makefile.ssl src/crypto/openssl/ssl s2_clnt.c s2_enc.c s2_lib.c s2_pkt.c s2_srvr.c

[Jacques Vidrine]

nectar      2004/03/17 09:44:39 PST

  FreeBSD src repository

  Modified files:
    crypto/openssl/apps  openssl.cnf speed.c 
    crypto/openssl/crypto/evp evp.h 
    crypto/openssl/crypto/idea Makefile.ssl 
    crypto/openssl/ssl   s2_clnt.c s2_enc.c s2_lib.c s2_pkt.c 
                         s2_srvr.c 
  Log:
  Resolve conflicts after import of OpenSSL 0.9.7d.
  
  Revision  Changes    Path
  1.6       +6 -1      src/crypto/openssl/apps/openssl.cnf
  1.12      +7 -0      src/crypto/openssl/apps/speed.c
  1.13      +2 -0      src/crypto/openssl/crypto/evp/evp.h
  1.7       +1 -1      src/crypto/openssl/crypto/idea/Makefile.ssl
  1.12      +0 -1      src/crypto/openssl/ssl/s2_clnt.c
  1.9       +0 -1      src/crypto/openssl/ssl/s2_enc.c
  1.10      +2 -1      src/crypto/openssl/ssl/s2_lib.c
  1.9       +0 -1      src/crypto/openssl/ssl/s2_pkt.c
  1.11      +0 -1      src/crypto/openssl/ssl/s2_srvr.c