diff options
author | jsing <> | 2021-01-21 18:48:57 +0000 |
---|---|---|
committer | jsing <> | 2021-01-21 18:48:57 +0000 |
commit | 56cb8632a04478fa825a640e148efb0caaea8105 (patch) | |
tree | a9f2b1b354d6aeff1054789852c39331dfb38add /src | |
parent | 7f4d42efa02cd9883613d692f3342480af693517 (diff) | |
download | openbsd-56cb8632a04478fa825a640e148efb0caaea8105.tar.gz openbsd-56cb8632a04478fa825a640e148efb0caaea8105.tar.bz2 openbsd-56cb8632a04478fa825a640e148efb0caaea8105.zip |
Mop up unused dtls1_build_sequence_number() function.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/d1_lib.c | 23 | ||||
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
2 files changed, 2 insertions, 25 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index b4ce2c0722..4d406271af 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_lib.c,v 1.51 2020/10/03 17:54:27 jsing Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.52 2021/01/21 18:48:56 jsing 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. |
@@ -423,24 +423,3 @@ dtls1_listen(SSL *s, struct sockaddr *client) | |||
423 | (void)BIO_dgram_get_peer(SSL_get_rbio(s), client); | 423 | (void)BIO_dgram_get_peer(SSL_get_rbio(s), client); |
424 | return 1; | 424 | return 1; |
425 | } | 425 | } |
426 | |||
427 | void | ||
428 | dtls1_build_sequence_number(unsigned char *dst, unsigned char *seq, | ||
429 | unsigned short epoch) | ||
430 | { | ||
431 | CBB cbb; | ||
432 | |||
433 | if (!CBB_init_fixed(&cbb, dst, SSL3_SEQUENCE_SIZE)) | ||
434 | goto err; | ||
435 | if (!CBB_add_u16(&cbb, epoch)) | ||
436 | goto err; | ||
437 | if (!CBB_add_bytes(&cbb, &seq[2], SSL3_SEQUENCE_SIZE - 2)) | ||
438 | goto err; | ||
439 | if (!CBB_finish(&cbb, NULL, NULL)) | ||
440 | goto err; | ||
441 | |||
442 | return; | ||
443 | |||
444 | err: | ||
445 | CBB_cleanup(&cbb); | ||
446 | } | ||
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 5a3e3ff726..01f2ebbab1 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.315 2021/01/19 19:07:39 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.316 2021/01/21 18:48:57 jsing 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 | * |
@@ -1276,8 +1276,6 @@ int dtls1_get_message_header(unsigned char *data, | |||
1276 | struct hm_header_st *msg_hdr); | 1276 | struct hm_header_st *msg_hdr); |
1277 | void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr); | 1277 | void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr); |
1278 | void dtls1_reset_seq_numbers(SSL *s, int rw); | 1278 | void dtls1_reset_seq_numbers(SSL *s, int rw); |
1279 | void dtls1_build_sequence_number(unsigned char *dst, unsigned char *seq, | ||
1280 | unsigned short epoch); | ||
1281 | struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft); | 1279 | struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft); |
1282 | int dtls1_check_timeout_num(SSL *s); | 1280 | int dtls1_check_timeout_num(SSL *s); |
1283 | int dtls1_handle_timeout(SSL *s); | 1281 | int dtls1_handle_timeout(SSL *s); |