kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add functions for accessing read_sequence and write_sequence.

Browse Source 
OpenSSL 1.1.0 doesn't seem to have these two, so this isn't based on anything.
Have them return uint64_t in preparation for switching the internal
representation to uint64_t so ssl_record_sequence_update can go away.

Change-Id: I21d55e9a29861c992f409ed293e0930a7aaef7a3
Reviewed-on: https://boringssl-review.googlesource.com/6941
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
David Benjamin 2016-01-21 16:39:58 -05:00 committed by Adam Langley
parent cdd0b7e775
commit 91b2501f02
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/openssl/ssl.h
View File

@ -2574,7 +2574,7 @@ OPENSSL_EXPORT int SSL_CTX_get_ex_new_index(long argl, void *argp,
CRYPTO_EX_free *free_func); CRYPTO_EX_free *free_func);
/* Obscure functions. */ /* Low-level record-layer state. */
/* SSL_get_rc4_state sets |*read_key| and |*write_key| to the RC4 states for /* SSL_get_rc4_state sets |*read_key| and |*write_key| to the RC4 states for
* the read and write directions. It returns one on success or zero if |ssl| * the read and write directions. It returns one on success or zero if |ssl|
@ -2600,6 +2600,17 @@ OPENSSL_EXPORT size_t SSL_get_key_block_len(const SSL *ssl);
OPENSSL_EXPORT int SSL_generate_key_block(const SSL *ssl, uint8_t *out, OPENSSL_EXPORT int SSL_generate_key_block(const SSL *ssl, uint8_t *out,
size_t out_len); size_t out_len);
/* SSL_get_read_sequence returns the expected sequence number of the next
* incoming record in the current epoch. It always returns zero in DTLS. */
OPENSSL_EXPORT uint64_t SSL_get_read_sequence(const SSL *ssl);
/* SSL_get_write_sequence returns the sequence number of the next outgoing
* record in the current epoch. */
OPENSSL_EXPORT uint64_t SSL_get_write_sequence(const SSL *ssl);
/* Obscure functions. */
/* SSL_get_structure_sizes returns the sizes of the SSL, SSL_CTX and /* SSL_get_structure_sizes returns the sizes of the SSL, SSL_CTX and
* SSL_SESSION structures so that a test can ensure that outside code agrees on * SSL_SESSION structures so that a test can ensure that outside code agrees on
* these values. */ * these values. */

16
ssl/ssl_lib.c
View File

@ -2544,6 +2544,22 @@ int SSL_get_ivs(const SSL *ssl, const uint8_t **out_read_iv,
return 1; return 1;
} }
static uint64_t be_to_u64(const uint8_t in[8]) {
return (((uint64_t)in[7]) << 56) | (((uint64_t)in[6]) << 48) |
(((uint64_t)in[5]) << 40) | (((uint64_t)in[4]) << 32) |
(((uint64_t)in[3]) << 24) | (((uint64_t)in[2]) << 16) |
(((uint64_t)in[1]) << 8) | ((uint64_t)in[0]);
}
uint64_t SSL_get_read_sequence(const SSL *ssl) {
/* TODO(davidben): Internally represent sequence numbers as uint64_t. */
return be_to_u64(ssl->s3->read_sequence);
}
uint64_t SSL_get_write_sequence(const SSL *ssl) {
return be_to_u64(ssl->s3->write_sequence);
}
uint8_t SSL_get_server_key_exchange_hash(const SSL *ssl) { uint8_t SSL_get_server_key_exchange_hash(const SSL *ssl) {
return ssl->s3->tmp.server_key_exchange_hash; return ssl->s3->tmp.server_key_exchange_hash;
} }