diff options
author | beck <> | 2017-01-22 07:16:39 +0000 |
---|---|---|
committer | beck <> | 2017-01-22 07:16:39 +0000 |
commit | 2204d5a39055900d89c6f7fbdcc3bb37ec8070db (patch) | |
tree | c03f505a3f0822dbc7a4d9523cfde19318c0d121 /src/lib/libssl/t1_enc.c | |
parent | 334c9196a27db4244daba48e4ba2118985c535ed (diff) | |
download | openbsd-2204d5a39055900d89c6f7fbdcc3bb37ec8070db.tar.gz openbsd-2204d5a39055900d89c6f7fbdcc3bb37ec8070db.tar.bz2 openbsd-2204d5a39055900d89c6f7fbdcc3bb37ec8070db.zip |
Move most of DTLS1_STATE to internal.
ok jsing@
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 04219eb1b7..67ad1ae924 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.87 2016/11/06 17:21:04 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.88 2017/01/22 07:16:39 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 | * |
@@ -849,7 +849,7 @@ tls1_enc(SSL *s, int send) | |||
849 | 849 | ||
850 | if (SSL_IS_DTLS(s)) { | 850 | if (SSL_IS_DTLS(s)) { |
851 | dtls1_build_sequence_number(ad, seq, | 851 | dtls1_build_sequence_number(ad, seq, |
852 | send ? s->d1->w_epoch : s->d1->r_epoch); | 852 | send ? D1I(s)->w_epoch : D1I(s)->r_epoch); |
853 | } else { | 853 | } else { |
854 | memcpy(ad, seq, SSL3_SEQUENCE_SIZE); | 854 | memcpy(ad, seq, SSL3_SEQUENCE_SIZE); |
855 | tls1_record_sequence_increment(seq); | 855 | tls1_record_sequence_increment(seq); |
@@ -1040,7 +1040,7 @@ tls1_enc(SSL *s, int send) | |||
1040 | 1040 | ||
1041 | if (SSL_IS_DTLS(s)) { | 1041 | if (SSL_IS_DTLS(s)) { |
1042 | dtls1_build_sequence_number(buf, seq, | 1042 | dtls1_build_sequence_number(buf, seq, |
1043 | send ? s->d1->w_epoch : s->d1->r_epoch); | 1043 | send ? D1I(s)->w_epoch : D1I(s)->r_epoch); |
1044 | } else { | 1044 | } else { |
1045 | memcpy(buf, seq, SSL3_SEQUENCE_SIZE); | 1045 | memcpy(buf, seq, SSL3_SEQUENCE_SIZE); |
1046 | tls1_record_sequence_increment(seq); | 1046 | tls1_record_sequence_increment(seq); |
@@ -1217,7 +1217,7 @@ tls1_mac(SSL *ssl, unsigned char *md, int send) | |||
1217 | 1217 | ||
1218 | if (SSL_IS_DTLS(ssl)) | 1218 | if (SSL_IS_DTLS(ssl)) |
1219 | dtls1_build_sequence_number(header, seq, | 1219 | dtls1_build_sequence_number(header, seq, |
1220 | send ? ssl->d1->w_epoch : ssl->d1->r_epoch); | 1220 | send ? D1I(ssl)->w_epoch : D1I(ssl)->r_epoch); |
1221 | else | 1221 | else |
1222 | memcpy(header, seq, SSL3_SEQUENCE_SIZE); | 1222 | memcpy(header, seq, SSL3_SEQUENCE_SIZE); |
1223 | 1223 | ||