Merge from 0.9.8 stable branch.

2007-04-24 11:30:51 +00:00
parent 1b936a5e37
commit 1139eeecbc
49 changed files with 1679 additions and 90 deletions
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -282,6 +282,7 @@ extern "C" {
 #define SSL_TXT_RC4		"RC4"
 #define SSL_TXT_RC2		"RC2"
 #define SSL_TXT_IDEA		"IDEA"
+#define SSL_TXT_SEED		"SEED"
 #define SSL_TXT_AES		"AES"
 #define SSL_TXT_CAMELLIA	"CAMELLIA"
 #define SSL_TXT_MD5		"MD5"