Commit 81025661 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update ssl code to support digests other than MD5+SHA1 in handshake.

Submitted by: Victor B. Wagner <vitus@cryptocom.ru>
parent 4ece7eb6
Loading
Loading
Loading
Loading
+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@

 Changes between 0.9.8f and 0.9.9  [xx XXX xxxx]

  *) Update ssl code to support digests other than SHA1+MD5 for handshake
     MAC. 

     [Victor B. Wagner <vitus@cryptocom.ru>]

  *) Add RFC4507 support to OpenSSL. This includes the corrections in
     RFC4507bis. The encrypted ticket format is an encrypted encoded
     SSL_SESSION structure, that way new session features are automatically
+113 −111

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Changes for crypto/objects/obj_mac.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3422,9 +3422,9 @@
#define SN_gost89_cnt		"gost89-cnt"
#define NID_gost89_cnt		835

#define SN_id_Gost28147_89_MAC		"id-Gost28147-89-MAC"
#define SN_id_Gost28147_89_MAC					"gost-mac"
#define LN_id_Gost28147_89_MAC					"GOST 28147-89 MAC"
#define NID_id_Gost28147_89_MAC		787
#define NID_id_Gost28147_89_MAC					843
#define OBJ_id_Gost28147_89_MAC					OBJ_cryptopro,22L

#define SN_id_GostR3411_94_prf		"prf-gostr3411-94"
+2 −0
Changes for crypto/objects/obj_mac.num: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -839,3 +839,5 @@ seed_ecb 838
seed_cbc		839
seed_cfb128		840
seed_ofb128		841
id_Gost28147_89_MAC		842
id_Gost28147_89_MAC					843
+2 −1
Changes for crypto/objects/objects.txt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1092,7 +1092,8 @@ cryptopro 20 : gost94 : GOST R 34.10-94
!Cname id-Gost28147-89
cryptopro 21		: gost89 		: GOST 28147-89
			: gost89-cnt
cryptopro 22		: id-Gost28147-89-MAC	: GOST 28147-89 MAC
!Cname id-Gost28147-89-MAC			
cryptopro 22		: gost-mac	: GOST 28147-89 MAC
!Cname id-GostR3411-94-prf
cryptopro 23		: prf-gostr3411-94	: GOST R 34.11-94 PRF
cryptopro 98		: id-GostR3410-2001DH	: GOST R 34.10-2001 DH
Loading