diff options
| author | jsing <> | 2015-09-11 18:08:21 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-11 18:08:21 +0000 |
| commit | eef886f2e086646b6180a7a6f2abb0ac1375e226 (patch) | |
| tree | 378accab3864084b0135769f8d9117e86df41845 /src/lib/libssl/s3_lib.c | |
| parent | 60dc7040a30e94a6f4027c1a0996b127c296273c (diff) | |
| download | openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.tar.gz openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.tar.bz2 openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.zip | |
Rename functions that moved to t1_enc.c, with a tls1_ prefix instead of a
ssl3_ prefix.
ok beck@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 984e343c95..1a619e3d30 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_lib.c,v 1.103 2015/09/11 17:32:23 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.104 2015/09/11 18:08:21 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 | * |
| @@ -2023,7 +2023,7 @@ ssl3_free(SSL *s) | |||
| 2023 | if (s == NULL) | 2023 | if (s == NULL) |
| 2024 | return; | 2024 | return; |
| 2025 | 2025 | ||
| 2026 | ssl3_cleanup_key_block(s); | 2026 | tls1_cleanup_key_block(s); |
| 2027 | ssl3_release_read_buffer(s); | 2027 | ssl3_release_read_buffer(s); |
| 2028 | ssl3_release_write_buffer(s); | 2028 | ssl3_release_write_buffer(s); |
| 2029 | 2029 | ||
| @@ -2033,7 +2033,7 @@ ssl3_free(SSL *s) | |||
| 2033 | if (s->s3->tmp.ca_names != NULL) | 2033 | if (s->s3->tmp.ca_names != NULL) |
| 2034 | sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free); | 2034 | sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free); |
| 2035 | BIO_free(s->s3->handshake_buffer); | 2035 | BIO_free(s->s3->handshake_buffer); |
| 2036 | ssl3_free_digest_list(s); | 2036 | tls1_free_digest_list(s); |
| 2037 | free(s->s3->alpn_selected); | 2037 | free(s->s3->alpn_selected); |
| 2038 | 2038 | ||
| 2039 | explicit_bzero(s->s3, sizeof *s->s3); | 2039 | explicit_bzero(s->s3, sizeof *s->s3); |
| @@ -2047,7 +2047,7 @@ ssl3_clear(SSL *s) | |||
| 2047 | unsigned char *rp, *wp; | 2047 | unsigned char *rp, *wp; |
| 2048 | size_t rlen, wlen; | 2048 | size_t rlen, wlen; |
| 2049 | 2049 | ||
| 2050 | ssl3_cleanup_key_block(s); | 2050 | tls1_cleanup_key_block(s); |
| 2051 | if (s->s3->tmp.ca_names != NULL) | 2051 | if (s->s3->tmp.ca_names != NULL) |
| 2052 | sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free); | 2052 | sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free); |
| 2053 | 2053 | ||
| @@ -2064,7 +2064,7 @@ ssl3_clear(SSL *s) | |||
| 2064 | BIO_free(s->s3->handshake_buffer); | 2064 | BIO_free(s->s3->handshake_buffer); |
| 2065 | s->s3->handshake_buffer = NULL; | 2065 | s->s3->handshake_buffer = NULL; |
| 2066 | 2066 | ||
| 2067 | ssl3_free_digest_list(s); | 2067 | tls1_free_digest_list(s); |
| 2068 | 2068 | ||
| 2069 | free(s->s3->alpn_selected); | 2069 | free(s->s3->alpn_selected); |
| 2070 | s->s3->alpn_selected = NULL; | 2070 | s->s3->alpn_selected = NULL; |
