diff options
author | jsing <> | 2017-01-23 14:35:42 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 14:35:42 +0000 |
commit | d43892e9652017c33ea2cf69639dc9a01090be5f (patch) | |
tree | 27eab6f3272b4b46f77e786896eae8e697800969 /src/lib/libssl/ssl_locl.h | |
parent | 0eff443f2ac1ae9043870f2d40d9dc0d57f236d6 (diff) | |
download | openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.gz openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.tar.bz2 openbsd-d43892e9652017c33ea2cf69639dc9a01090be5f.zip |
Move options and mode from SSL_CTX and SSL to internal, since these can be
set and cleared via existing functions.
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index df1e12bf39..d0d72cbfdf 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.161 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.162 2017/01/23 14:35:42 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 | * |
@@ -434,6 +434,9 @@ typedef struct ssl_ctx_internal_st { | |||
434 | uint16_t min_version; | 434 | uint16_t min_version; |
435 | uint16_t max_version; | 435 | uint16_t max_version; |
436 | 436 | ||
437 | unsigned long options; | ||
438 | unsigned long mode; | ||
439 | |||
437 | /* If this callback is not null, it will be called each | 440 | /* If this callback is not null, it will be called each |
438 | * time a session id is added to the cache. If this function | 441 | * time a session id is added to the cache. If this function |
439 | * returns 1, it means that the callback will do a | 442 | * returns 1, it means that the callback will do a |
@@ -612,6 +615,9 @@ typedef struct ssl_internal_st { | |||
612 | uint16_t min_version; | 615 | uint16_t min_version; |
613 | uint16_t max_version; | 616 | uint16_t max_version; |
614 | 617 | ||
618 | unsigned long options; /* protocol behaviour */ | ||
619 | unsigned long mode; /* API behaviour */ | ||
620 | |||
615 | /* Next protocol negotiation. For the client, this is the protocol that | 621 | /* Next protocol negotiation. For the client, this is the protocol that |
616 | * we sent in NextProtocol and is set when handling ServerHello | 622 | * we sent in NextProtocol and is set when handling ServerHello |
617 | * extensions. | 623 | * extensions. |