summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2021-03-10 18:32:38 +0000
committerjsing <>2021-03-10 18:32:38 +0000
commitd3e2243d370320c3e45682872b38893d842062a3 (patch)
tree1420b8dcb41286dd383a181f3a7558d37c4c72ef
parentb326c1132769dfe25e6d64ec5ea394f654db1a8e (diff)
downloadopenbsd-d3e2243d370320c3e45682872b38893d842062a3.tar.gz
openbsd-d3e2243d370320c3e45682872b38893d842062a3.tar.bz2
openbsd-d3e2243d370320c3e45682872b38893d842062a3.zip
Guard TLS1_get_{client_,}version() macros with #ifndef LIBRESSL_INTERNAL.
These are no longer used (and should not be used) internally.
-rw-r--r--src/lib/libssl/tls1.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index 8cd5226582..628a6b2fca 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls1.h,v 1.41 2020/06/05 18:14:05 jsing Exp $ */ 1/* $OpenBSD: tls1.h,v 1.42 2021/03/10 18:32:38 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -177,11 +177,13 @@ extern "C" {
177#define TLS1_VERSION_MAJOR 0x03 177#define TLS1_VERSION_MAJOR 0x03
178#define TLS1_VERSION_MINOR 0x01 178#define TLS1_VERSION_MINOR 0x01
179 179
180#ifndef LIBRESSL_INTERNAL
180#define TLS1_get_version(s) \ 181#define TLS1_get_version(s) \
181 ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0) 182 ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)
182 183
183#define TLS1_get_client_version(s) \ 184#define TLS1_get_client_version(s) \
184 ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0) 185 ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)
186#endif
185 187
186/* 188/*
187 * TLS Alert codes. 189 * TLS Alert codes.