diff options
author | tb <> | 2021-05-02 18:10:32 +0000 |
---|---|---|
committer | tb <> | 2021-05-02 18:10:32 +0000 |
commit | 52195ac2289506991c37cf6b5e940c2dbb9e8577 (patch) | |
tree | 81350c96476840ca5bdd1bfbc38bb114fc6db0f3 /src/lib | |
parent | 138d879b1616ace5c1ae9d93e2d734b08892691d (diff) | |
download | openbsd-52195ac2289506991c37cf6b5e940c2dbb9e8577.tar.gz openbsd-52195ac2289506991c37cf6b5e940c2dbb9e8577.tar.bz2 openbsd-52195ac2289506991c37cf6b5e940c2dbb9e8577.zip |
Prevent future internal use of some #defines
After jsing's recent commits, SSL3_CC_{READ,WRITE,CLIENT,SERVER}
and the derived SSL3_CHANGE_CIPHER_{CLIENT,SERVER}_{READ,WRITE}
are no longer used by LibreSSL and should never be used again.
discussed with jsing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl3.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h index a102d11434..fc40c20d6c 100644 --- a/src/lib/libssl/ssl3.h +++ b/src/lib/libssl/ssl3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl3.h,v 1.51 2020/06/05 18:14:05 jsing Exp $ */ | 1 | /* $OpenBSD: ssl3.h,v 1.52 2021/05/02 18:10:32 tb 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 | * |
@@ -475,6 +475,7 @@ typedef struct ssl3_state_st { | |||
475 | 475 | ||
476 | #define SSL3_MT_CCS 1 | 476 | #define SSL3_MT_CCS 1 |
477 | 477 | ||
478 | #ifndef LIBRESSL_INTERNAL | ||
478 | /* These are used when changing over to a new cipher */ | 479 | /* These are used when changing over to a new cipher */ |
479 | #define SSL3_CC_READ 0x01 | 480 | #define SSL3_CC_READ 0x01 |
480 | #define SSL3_CC_WRITE 0x02 | 481 | #define SSL3_CC_WRITE 0x02 |
@@ -484,6 +485,7 @@ typedef struct ssl3_state_st { | |||
484 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) | 485 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) |
485 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) | 486 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) |
486 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) | 487 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) |
488 | #endif | ||
487 | 489 | ||
488 | #ifdef __cplusplus | 490 | #ifdef __cplusplus |
489 | } | 491 | } |