diff options
| author | markus <> | 2002-09-10 16:31:57 +0000 |
|---|---|---|
| committer | markus <> | 2002-09-10 16:31:57 +0000 |
| commit | 7d038e9d4d83e7c7120e78418e108df70b9025d6 (patch) | |
| tree | baf775b286ff801a89f746b1938a3c700bba6822 /src/lib/libssl/tls1.h | |
| parent | 3bd21dd4c3a3e3106321a5f6b3641ab9f18a6e3b (diff) | |
| download | openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.gz openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.bz2 openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.zip | |
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'src/lib/libssl/tls1.h')
| -rw-r--r-- | src/lib/libssl/tls1.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 88ec5fb527..38838ea9a5 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -96,7 +96,7 @@ extern "C" { | |||
| 96 | #define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065 | 96 | #define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA 0x03000065 |
| 97 | #define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066 | 97 | #define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA 0x03000066 |
| 98 | 98 | ||
| 99 | /* AES ciphersuites from draft ietf-tls-ciphersuite-03.txt */ | 99 | /* AES ciphersuites from RFC3268 */ |
| 100 | 100 | ||
| 101 | #define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F | 101 | #define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F |
| 102 | #define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030 | 102 | #define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030 |
| @@ -126,20 +126,21 @@ extern "C" { | |||
| 126 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA" | 126 | #define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA "EXP1024-RC4-SHA" |
| 127 | #define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA" | 127 | #define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA" |
| 128 | #define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA" | 128 | #define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA" |
| 129 | /* AES ciphersuites from draft-ietf-tls-ciphersuite-06.txt */ | 129 | |
| 130 | #define TLS1_TXT_RSA_WITH_AES_128_SHA "AESdraft128-SHA" | 130 | /* AES ciphersuites from RFC3268 */ |
| 131 | #define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AESdraft128-SHA" | 131 | #define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA" |
| 132 | #define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AESdraft128-SHA" | 132 | #define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA" |
| 133 | #define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AESdraft128-SHA" | 133 | #define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA" |
| 134 | #define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AESdraft128-SHA" | 134 | #define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA" |
| 135 | #define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AESdraft128-SHA" | 135 | #define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA" |
| 136 | 136 | #define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA" | |
| 137 | #define TLS1_TXT_RSA_WITH_AES_256_SHA "AESdraft256-SHA" | 137 | |
| 138 | #define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AESdraft256-SHA" | 138 | #define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA" |
| 139 | #define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AESdraft256-SHA" | 139 | #define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA" |
| 140 | #define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AESdraft256-SHA" | 140 | #define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA" |
| 141 | #define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AESdraft256-SHA" | 141 | #define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA" |
| 142 | #define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AESdraft256-SHA" | 142 | #define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA" |
| 143 | #define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA" | ||
| 143 | 144 | ||
| 144 | 145 | ||
| 145 | #define TLS_CT_RSA_SIGN 1 | 146 | #define TLS_CT_RSA_SIGN 1 |