diff options
| author | beck <> | 2016-03-06 14:52:15 +0000 |
|---|---|---|
| committer | beck <> | 2016-03-06 14:52:15 +0000 |
| commit | f456014e63e02a559c728916fc627f5ae9139fdc (patch) | |
| tree | 03a7bc812f759bdf7b191b911ca241601f2a19dd /src/lib/libssl/d1_both.c | |
| parent | 5a8200b9524c9bceedeb01dec021bdfe4b411500 (diff) | |
| download | openbsd-f456014e63e02a559c728916fc627f5ae9139fdc.tar.gz openbsd-f456014e63e02a559c728916fc627f5ae9139fdc.tar.bz2 openbsd-f456014e63e02a559c728916fc627f5ae9139fdc.zip | |
Make sure stdio functions don't end up in the library, from miod@
ok doug@ bcook@
Diffstat (limited to 'src/lib/libssl/d1_both.c')
| -rw-r--r-- | src/lib/libssl/d1_both.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c index 448bd76fd0..bce084f1ee 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.38 2015/09/11 18:08:21 jsing Exp $ */ | 1 | /* $OpenBSD: d1_both.c,v 1.39 2016/03/06 14:52:15 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. |
| @@ -1014,8 +1014,10 @@ int | |||
| 1014 | dtls1_read_failed(SSL *s, int code) | 1014 | dtls1_read_failed(SSL *s, int code) |
| 1015 | { | 1015 | { |
| 1016 | if (code > 0) { | 1016 | if (code > 0) { |
| 1017 | #ifdef DEBUG | ||
| 1017 | fprintf(stderr, "invalid state reached %s:%d", | 1018 | fprintf(stderr, "invalid state reached %s:%d", |
| 1018 | __FILE__, __LINE__); | 1019 | __FILE__, __LINE__); |
| 1020 | #endif | ||
| 1019 | return 1; | 1021 | return 1; |
| 1020 | } | 1022 | } |
| 1021 | 1023 | ||
| @@ -1071,7 +1073,9 @@ dtls1_retransmit_buffered_messages(SSL *s) | |||
| 1071 | (unsigned short)dtls1_get_queue_priority( | 1073 | (unsigned short)dtls1_get_queue_priority( |
| 1072 | frag->msg_header.seq, frag->msg_header.is_ccs), 0, | 1074 | frag->msg_header.seq, frag->msg_header.is_ccs), 0, |
| 1073 | &found) <= 0 && found) { | 1075 | &found) <= 0 && found) { |
| 1076 | #ifdef DEBUG | ||
| 1074 | fprintf(stderr, "dtls1_retransmit_message() failed\n"); | 1077 | fprintf(stderr, "dtls1_retransmit_message() failed\n"); |
| 1078 | #endif | ||
| 1075 | return -1; | 1079 | return -1; |
| 1076 | } | 1080 | } |
| 1077 | } | 1081 | } |
| @@ -1163,7 +1167,9 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off, | |||
| 1163 | 1167 | ||
| 1164 | item = pqueue_find(s->d1->sent_messages, seq64be); | 1168 | item = pqueue_find(s->d1->sent_messages, seq64be); |
| 1165 | if (item == NULL) { | 1169 | if (item == NULL) { |
| 1170 | #ifdef DEBUG | ||
| 1166 | fprintf(stderr, "retransmit: message %d non-existant\n", seq); | 1171 | fprintf(stderr, "retransmit: message %d non-existant\n", seq); |
| 1172 | #endif | ||
| 1167 | *found = 0; | 1173 | *found = 0; |
| 1168 | return 0; | 1174 | return 0; |
| 1169 | } | 1175 | } |
