diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
| commit | 1b2aa7959c86a835491c8cfca8c0683b747c1855 (patch) | |
| tree | 9a0ba58647a2d57115f5c003ca4673e7693c950a /openssl/vendor/current/ssl/ssl_locl.h | |
| parent | 084adb601f2d375395c6cdcedf8af91f1065fe4e (diff) | |
Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d
svn path=/openssl/vendor/current/CHANGES; revision=375
Diffstat (limited to 'openssl/vendor/current/ssl/ssl_locl.h')
| -rw-r--r-- | openssl/vendor/current/ssl/ssl_locl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openssl/vendor/current/ssl/ssl_locl.h b/openssl/vendor/current/ssl/ssl_locl.h index 0bebaf02..786d9886 100644 --- a/openssl/vendor/current/ssl/ssl_locl.h +++ b/openssl/vendor/current/ssl/ssl_locl.h @@ -278,7 +278,7 @@ #define SSL_FZA (SSL_aFZA|SSL_kFZA|SSL_eFZA) #define SSL_KRB5 (SSL_kKRB5|SSL_aKRB5) -#define SSL_ENC_MASK 0x043F8000L +#define SSL_ENC_MASK 0x0C3F8000L #define SSL_DES 0x00008000L #define SSL_3DES 0x00010000L #define SSL_RC4 0x00020000L @@ -287,6 +287,7 @@ #define SSL_eFZA 0x00100000L #define SSL_eNULL 0x00200000L #define SSL_AES 0x04000000L +#define SSL_CAMELLIA 0x08000000L #define SSL_MAC_MASK 0x00c00000L #define SSL_MD5 0x00400000L @@ -298,7 +299,7 @@ #define SSL_SSLV3 0x02000000L #define SSL_TLSV1 SSL_SSLV3 /* for now */ -/* we have used 07ffffff - 5 bits left to go. */ +/* we have used 0fffffff - 4 bits left to go. */ /* * Export and cipher strength information. For each cipher we have to decide |