diff options
| author | beck <> | 2017-05-07 04:22:24 +0000 |
|---|---|---|
| committer | beck <> | 2017-05-07 04:22:24 +0000 |
| commit | 2439ee31e965a96d3685f362e5a32d365a9e5eaa (patch) | |
| tree | 9f980ffff8490ca0af628971a6d8ceb4a23d3b99 /src/lib/libssl/ssl_stat.c | |
| parent | 9706d48a7c3efe16618188b2cb81126a13667693 (diff) | |
| download | openbsd-2439ee31e965a96d3685f362e5a32d365a9e5eaa.tar.gz openbsd-2439ee31e965a96d3685f362e5a32d365a9e5eaa.tar.bz2 openbsd-2439ee31e965a96d3685f362e5a32d365a9e5eaa.zip | |
Move state from ssl->internal to the handshake structure.
while we are at it, convert SSLerror to use a function
internally, so that we may later allocate the handshake
structure and check for it
ok jsing@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_stat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c index 4f93781f72..6b26d4c915 100644 --- a/src/lib/libssl/ssl_stat.c +++ b/src/lib/libssl/ssl_stat.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_stat.c,v 1.13 2017/01/23 08:48:45 beck Exp $ */ | 1 | /* $OpenBSD: ssl_stat.c,v 1.14 2017/05/07 04:22:24 beck 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 | * |
| @@ -91,7 +91,7 @@ SSL_state_string_long(const SSL *s) | |||
| 91 | { | 91 | { |
| 92 | const char *str; | 92 | const char *str; |
| 93 | 93 | ||
| 94 | switch (s->internal->state) { | 94 | switch (S3I(s)->hs.state) { |
| 95 | case SSL_ST_BEFORE: | 95 | case SSL_ST_BEFORE: |
| 96 | str = "before SSL initialization"; | 96 | str = "before SSL initialization"; |
| 97 | break; | 97 | break; |
| @@ -347,7 +347,7 @@ SSL_state_string(const SSL *s) | |||
| 347 | { | 347 | { |
| 348 | const char *str; | 348 | const char *str; |
| 349 | 349 | ||
| 350 | switch (s->internal->state) { | 350 | switch (S3I(s)->hs.state) { |
| 351 | case SSL_ST_BEFORE: | 351 | case SSL_ST_BEFORE: |
| 352 | str = "PINIT "; | 352 | str = "PINIT "; |
| 353 | break; | 353 | break; |
