summaryrefslogtreecommitdiff
path: root/lib/cipher.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-20 14:54:38 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-20 14:54:38 +0200
commit369a364007a141c73831e95b60be4cd81eec0d63 (patch)
treecf53ab4952fa42a08ee27ecaa2f4e235ecc95f56 /lib/cipher.c
parent1445215a1210df12df28fe0faf48972d0c095857 (diff)
downloadgnutls-369a364007a141c73831e95b60be4cd81eec0d63.tar.gz
Amend: Allow for conditional compilation of SSL 3.0 protocol
This patch makes conditional several more SSL 3.0-only parts of codebase.
Diffstat (limited to 'lib/cipher.c')
-rw-r--r--lib/cipher.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/cipher.c b/lib/cipher.c
index 04507d12e6..50096df6c4 100644
--- a/lib/cipher.c
+++ b/lib/cipher.c
@@ -265,7 +265,10 @@ make_preamble(uint8_t * uint64_data, uint8_t type, unsigned int length,
p += 8;
*p = type;
p++;
- if (ver->id != GNUTLS_SSL3) { /* TLS protocols */
+#ifdef ENABLE_SSL3
+ if (ver->id != GNUTLS_SSL3)
+#endif
+ { /* TLS protocols */
*p = ver->major;
p++;
*p = ver->minor;
@@ -739,7 +742,9 @@ ciphertext_to_compressed(gnutls_session_t session,
* Note that we access all 256 bytes of ciphertext for padding check
* because there is a timing channel in that memory access (in certain CPUs).
*/
+#ifdef ENABLE_SSL3
if (ver->id != GNUTLS_SSL3)
+#endif
for (i = 2; i <= MIN(256, ciphertext->size); i++) {
tmp_pad_failed |=
(compressed->