diff options
| author | tedu <> | 2014-05-30 14:30:50 +0000 |
|---|---|---|
| committer | tedu <> | 2014-05-30 14:30:50 +0000 |
| commit | 67bd16bada684b2830592ec71f9fb0d7690e490f (patch) | |
| tree | cbf937e75b5dc1f5e8f2452d45ad4d6942a9b1d4 /src/lib/libssl/ssl3.h | |
| parent | f4109fbc0367c4e1052b93015df4481e5e788146 (diff) | |
| download | openbsd-67bd16bada684b2830592ec71f9fb0d7690e490f.tar.gz openbsd-67bd16bada684b2830592ec71f9fb0d7690e490f.tar.bz2 openbsd-67bd16bada684b2830592ec71f9fb0d7690e490f.zip | |
remove some #if 0 code. we don't need any more reminders that we're using
a not quite appropriate data structure. ok jsing
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl3.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h index 2840b1320f..8633dae521 100644 --- a/src/lib/libssl/ssl3.h +++ b/src/lib/libssl/ssl3.h | |||
| @@ -162,16 +162,6 @@ extern "C" { | |||
| 162 | #define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A | 162 | #define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A |
| 163 | #define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B | 163 | #define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B |
| 164 | 164 | ||
| 165 | #if 0 | ||
| 166 | #define SSL3_CK_FZA_DMS_NULL_SHA 0x0300001C | ||
| 167 | #define SSL3_CK_FZA_DMS_FZA_SHA 0x0300001D | ||
| 168 | #if 0 /* Because it clashes with KRB5, is never used any more, and is safe | ||
| 169 | to remove according to David Hopwood <david.hopwood@zetnet.co.uk> | ||
| 170 | of the ietf-tls list */ | ||
| 171 | #define SSL3_CK_FZA_DMS_RC4_SHA 0x0300001E | ||
| 172 | #endif | ||
| 173 | #endif | ||
| 174 | |||
| 175 | /* VRS Additional Kerberos5 entries | 165 | /* VRS Additional Kerberos5 entries |
| 176 | */ | 166 | */ |
| 177 | #define SSL3_CK_KRB5_DES_64_CBC_SHA 0x0300001E | 167 | #define SSL3_CK_KRB5_DES_64_CBC_SHA 0x0300001E |
| @@ -221,12 +211,6 @@ extern "C" { | |||
| 221 | #define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA" | 211 | #define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA" |
| 222 | #define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA" | 212 | #define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA" |
| 223 | 213 | ||
| 224 | #if 0 | ||
| 225 | #define SSL3_TXT_FZA_DMS_NULL_SHA "FZA-NULL-SHA" | ||
| 226 | #define SSL3_TXT_FZA_DMS_FZA_SHA "FZA-FZA-CBC-SHA" | ||
| 227 | #define SSL3_TXT_FZA_DMS_RC4_SHA "FZA-RC4-SHA" | ||
| 228 | #endif | ||
| 229 | |||
| 230 | #define SSL3_TXT_KRB5_DES_64_CBC_SHA "KRB5-DES-CBC-SHA" | 214 | #define SSL3_TXT_KRB5_DES_64_CBC_SHA "KRB5-DES-CBC-SHA" |
| 231 | #define SSL3_TXT_KRB5_DES_192_CBC3_SHA "KRB5-DES-CBC3-SHA" | 215 | #define SSL3_TXT_KRB5_DES_192_CBC3_SHA "KRB5-DES-CBC3-SHA" |
| 232 | #define SSL3_TXT_KRB5_RC4_128_SHA "KRB5-RC4-SHA" | 216 | #define SSL3_TXT_KRB5_RC4_128_SHA "KRB5-RC4-SHA" |
