Date: Tue, 28 Jan 2003 14:34:21 -0800 (PST) From: Mark Murray <markm@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssl/apps openssl.cnf speed.c src/crypto/openssl/crypto/des des.h src/crypto/openssl/crypto/err err_all.c src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/idea Makefile.ssl i_cbc.c i_cfb64.c ... Message-ID: <200301282234.h0SMYLh3071640@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 2003/01/28 14:34:21 PST
Modified files:
crypto/openssl/apps openssl.cnf speed.c
crypto/openssl/crypto/des des.h
crypto/openssl/crypto/err err_all.c
crypto/openssl/crypto/evp evp.h
crypto/openssl/crypto/idea Makefile.ssl i_cbc.c i_cfb64.c
i_ecb.c i_ofb64.c i_skey.c idea.h
idea_lcl.h idea_spd.c ideatest.c
version
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_pkt.c
s2_srvr.c
crypto/openssl/util/pl Mingw32.pl
Log:
Merge conflicts.
This is cunning doublespeak for "use vendor code".
Revision Changes Path
1.4 +12 -2 src/crypto/openssl/apps/openssl.cnf
1.10 +809 -318 src/crypto/openssl/apps/speed.c
1.9 +131 -161 src/crypto/openssl/crypto/des/des.h
1.6 +29 -25 src/crypto/openssl/crypto/err/err_all.c
1.12 +276 -228 src/crypto/openssl/crypto/evp/evp.h
1.6 +9 -10 src/crypto/openssl/crypto/idea/Makefile.ssl
1.6 +0 -1 src/crypto/openssl/crypto/idea/i_cbc.c
1.6 +0 -1 src/crypto/openssl/crypto/idea/i_cfb64.c
1.6 +0 -1 src/crypto/openssl/crypto/idea/i_ecb.c
1.6 +0 -1 src/crypto/openssl/crypto/idea/i_ofb64.c
1.6 +0 -1 src/crypto/openssl/crypto/idea/i_skey.c
1.6 +1 -2 src/crypto/openssl/crypto/idea/idea.h
1.5 +0 -1 src/crypto/openssl/crypto/idea/idea_lcl.h
1.5 +3 -4 src/crypto/openssl/crypto/idea/idea_spd.c
1.5 +4 -3 src/crypto/openssl/crypto/idea/ideatest.c
1.5 +0 -1 src/crypto/openssl/crypto/idea/version
1.9 +77 -71 src/crypto/openssl/crypto/rsa/rsa.h
1.9 +34 -23 src/crypto/openssl/crypto/rsa/rsa_eay.c
1.7 +82 -38 src/crypto/openssl/crypto/rsa/rsa_lib.c
1.7 +28 -15 src/crypto/openssl/ssl/s23_clnt.c
1.6 +3 -5 src/crypto/openssl/ssl/s23_lib.c
1.7 +31 -82 src/crypto/openssl/ssl/s23_srvr.c
1.10 +76 -31 src/crypto/openssl/ssl/s2_clnt.c
1.8 +11 -9 src/crypto/openssl/ssl/s2_enc.c
1.9 +49 -35 src/crypto/openssl/ssl/s2_lib.c
1.5 +15 -10 src/crypto/openssl/ssl/s2_meth.c
1.8 +6 -3 src/crypto/openssl/ssl/s2_pkt.c
1.10 +67 -27 src/crypto/openssl/ssl/s2_srvr.c
1.5 +8 -7 src/crypto/openssl/util/pl/Mingw32.pl
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301282234.h0SMYLh3071640>