diff options
author | beck <> | 2017-01-23 08:48:45 +0000 |
---|---|---|
committer | beck <> | 2017-01-23 08:48:45 +0000 |
commit | 61af17199189570a4400f2757a9e8dab4bb76d2a (patch) | |
tree | e1f210556179334ded73129e6e0733758fe22365 /src/lib/libssl/d1_both.c | |
parent | c85967e4f9c3e1f3b3217545939f1d44ddf9f103 (diff) | |
download | openbsd-61af17199189570a4400f2757a9e8dab4bb76d2a.tar.gz openbsd-61af17199189570a4400f2757a9e8dab4bb76d2a.tar.bz2 openbsd-61af17199189570a4400f2757a9e8dab4bb76d2a.zip |
send state and rstate from ssl_st into internal. There are accessors
so these should not be diddled with directly
ok jsing@
Diffstat (limited to 'src/lib/libssl/d1_both.c')
-rw-r--r-- | src/lib/libssl/d1_both.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index f440a8baf2..e709caa604 100644 --- a/src/lib/libssl/d1_both.c +++ b/src/lib/libssl/d1_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_both.c,v 1.44 2017/01/23 06:45:30 beck Exp $ */ | 1 | /* $OpenBSD: d1_both.c,v 1.45 2017/01/23 08:48:44 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -856,7 +856,7 @@ again: | |||
856 | goto f_err; | 856 | goto f_err; |
857 | 857 | ||
858 | /* XDTLS: ressurect this when restart is in place */ | 858 | /* XDTLS: ressurect this when restart is in place */ |
859 | s->state = stn; | 859 | s->internal->state = stn; |
860 | 860 | ||
861 | if (frag_len > 0) { | 861 | if (frag_len > 0) { |
862 | unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; | 862 | unsigned char *p = (unsigned char *)s->internal->init_buf->data + DTLS1_HM_HEADER_LENGTH; |
@@ -915,7 +915,7 @@ dtls1_send_change_cipher_spec(SSL *s, int a, int b) | |||
915 | { | 915 | { |
916 | unsigned char *p; | 916 | unsigned char *p; |
917 | 917 | ||
918 | if (s->state == a) { | 918 | if (s->internal->state == a) { |
919 | p = (unsigned char *)s->internal->init_buf->data; | 919 | p = (unsigned char *)s->internal->init_buf->data; |
920 | *p++=SSL3_MT_CCS; | 920 | *p++=SSL3_MT_CCS; |
921 | D1I(s)->handshake_write_seq = D1I(s)->next_handshake_write_seq; | 921 | D1I(s)->handshake_write_seq = D1I(s)->next_handshake_write_seq; |
@@ -929,7 +929,7 @@ dtls1_send_change_cipher_spec(SSL *s, int a, int b) | |||
929 | /* buffer the message to handle re-xmits */ | 929 | /* buffer the message to handle re-xmits */ |
930 | dtls1_buffer_message(s, 1); | 930 | dtls1_buffer_message(s, 1); |
931 | 931 | ||
932 | s->state = b; | 932 | s->internal->state = b; |
933 | } | 933 | } |
934 | 934 | ||
935 | /* SSL3_ST_CW_CHANGE_B */ | 935 | /* SSL3_ST_CW_CHANGE_B */ |