diff options
| author | beck <> | 2017-05-06 22:24:58 +0000 |
|---|---|---|
| committer | beck <> | 2017-05-06 22:24:58 +0000 |
| commit | ba0818f10be313fb81078efbbc62472ce82b1372 (patch) | |
| tree | 4bcdcd934dd374037387e49c88e9fc7a9c2362be /src/lib/libssl/ssl_both.c | |
| parent | 23aac51cdb900b0a82e7fde3fcf59614f22505c7 (diff) | |
| download | openbsd-ba0818f10be313fb81078efbbc62472ce82b1372.tar.gz openbsd-ba0818f10be313fb81078efbbc62472ce82b1372.tar.bz2 openbsd-ba0818f10be313fb81078efbbc62472ce82b1372.zip | |
Bring in an SSL_HANDSHAKE structure and commence the great shovelling
ok jsing@, gcc@, regress@
Diffstat (limited to 'src/lib/libssl/ssl_both.c')
| -rw-r--r-- | src/lib/libssl/ssl_both.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_both.c b/src/lib/libssl/ssl_both.c index d1a0879b72..13c39e85b2 100644 --- a/src/lib/libssl/ssl_both.c +++ b/src/lib/libssl/ssl_both.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_both.c,v 1.7 2017/03/05 14:24:12 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_both.c,v 1.8 2017/05/06 22:24:57 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 | * |
| @@ -224,7 +224,7 @@ ssl3_take_mac(SSL *s) | |||
| 224 | * If no new cipher setup return immediately: other functions will | 224 | * If no new cipher setup return immediately: other functions will |
| 225 | * set the appropriate error. | 225 | * set the appropriate error. |
| 226 | */ | 226 | */ |
| 227 | if (S3I(s)->tmp.new_cipher == NULL) | 227 | if (S3I(s)->hs.new_cipher == NULL) |
| 228 | return; | 228 | return; |
| 229 | 229 | ||
| 230 | if (s->internal->state & SSL_ST_CONNECT) { | 230 | if (s->internal->state & SSL_ST_CONNECT) { |
