CVSROOT: /cvs Module name: src Changes by: st...@cvs.openbsd.org 2014/06/05 11:05:16
Modified files: lib/libssl/src/ssl: Tag: OPENBSD_5_5 s3_clnt.c s3_pkt.c s3_srvr.c ssl_locl.h Log message: MFC ChangeCipherSpec fixes (CVE-2014-0224 and additional safeguard), ok jsing@ "Be selective as to when ChangeCipherSpec messages will be accepted. Without this an early ChangeCipherSpec message would result in session keys being generated, along with the Finished hash for the handshake, using an empty master secret." From s3_clnt.c r1.64, s3_pkt.c r1.42, s3_srvr.c r1.59, ssl3.h r1.19 - note that the ssl3.h change has been applied to s3_locl.h instead to simplify patching. "Ensure that we do not process a ChangeCipherSpec with an empty master secret. This is an additional safeguard against early ChangeCipherSpec handling." From s3_pkt.c:1.43