Date: Sun, 27 Jan 2002 17:33:57 -0800 From: Kris Kennaway <kris@obsecurity.org> To: Greg Lehey <grog@FreeBSD.org> Cc: Kris Kennaway <kris@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssl/crypto/evp evp.h src/crypto/openssl/crypto/rsa rsa.h rsa_eay.c src/crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c s2_pkt.c s2_srvr.c Message-ID: <20020127173357.A33513@xor.obsecurity.org> In-Reply-To: <20020128104807.O72512@wantadilla.lemis.com>; from grog@FreeBSD.org on Mon, Jan 28, 2002 at 10:48:07AM %2B1030 References: <200201270317.g0R3HDh14980@freefall.freebsd.org> <20020128104807.O72512@wantadilla.lemis.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0OAP2g/MAC+5xKAE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 28, 2002 at 10:48:07AM +1030, Greg Lehey wrote: > On Saturday, 26 January 2002 at 19:17:13 -0800, Kris Kennaway wrote: > > kris 2002/01/26 19:17:13 PST > > > > Modified files: > > crypto/openssl/crypto/evp evp.h > > crypto/openssl/crypto/rsa rsa.h rsa_eay.c > > crypto/openssl/ssl s23_clnt.c s23_srvr.c s2_clnt.c s2_enc.c > > s2_pkt.c s2_srvr.c > > Log: > > Resolve conflicts. > > > > Revision Changes Path > > 1.9 +2 -4 src/crypto/openssl/crypto/evp/evp.h > > 1.7 +3 -4 src/crypto/openssl/crypto/rsa/rsa.h > > 1.7 +32 -3 src/crypto/openssl/crypto/rsa/rsa_eay.c > > 1.6 +2 -2 src/crypto/openssl/ssl/s23_clnt.c > > 1.6 +81 -12 src/crypto/openssl/ssl/s23_srvr.c > > 1.7 +89 -22 src/crypto/openssl/ssl/s2_clnt.c > > 1.6 +3 -3 src/crypto/openssl/ssl/s2_enc.c > > 1.7 +38 -21 src/crypto/openssl/ssl/s2_pkt.c > > 1.7 +120 -22 src/crypto/openssl/ssl/s2_srvr.c >=20 > That's a lot of conflicts. Some of them appear to be added copyright > notices and some code changes which aren't immediately apparent, but > don't look much like conflicts to me. Can't we have a more > descriptive log message? You seem to ask for this a lot; I don't think you understand the cvs import process. Typically the cvs import will produce a lot of conflicts on files which are off the vendor branch. An automatic command will then resolve a lot of them; the diffs you see are vendor changes which are being reconciled with ours, not my changes which are being slipped in here by the backdoor. Change information is available in the /usr/src/crypto/openssl/CHANGES file if you are interested to read it. It's not appropriate to give the list of changes in the commit log as well. Kris --0OAP2g/MAC+5xKAE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE8VKqEWry0BWjoQKURAknLAKCUbJvXg77ngBb0b9j/rsUCq23XyQCfVBwI ++C/0BWmvYgmaj3Cisd32yo= =x9Q3 -----END PGP SIGNATURE----- --0OAP2g/MAC+5xKAE-- 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?20020127173357.A33513>