diff options
| author | tb <> | 2024-03-01 03:46:54 +0000 |
|---|---|---|
| committer | tb <> | 2024-03-01 03:46:54 +0000 |
| commit | c95cd34b68853f0bcf248d64df4fbe90e47af794 (patch) | |
| tree | 36341402b452d0881e379cd1a2ad8a64be557db4 /src | |
| parent | 3f8118d230db791e442d7c0356a9b1c3752f6d4a (diff) | |
| download | openbsd-c95cd34b68853f0bcf248d64df4fbe90e47af794.tar.gz openbsd-c95cd34b68853f0bcf248d64df4fbe90e47af794.tar.bz2 openbsd-c95cd34b68853f0bcf248d64df4fbe90e47af794.zip | |
exporter: use the atrocious SSL_CIPHER_find() rather than get_by_id()
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/lib/libssl/exporter/exportertest.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/exporter/exportertest.c b/src/regress/lib/libssl/exporter/exportertest.c index 252fcb062e..ee8dbaa909 100644 --- a/src/regress/lib/libssl/exporter/exportertest.c +++ b/src/regress/lib/libssl/exporter/exportertest.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: exportertest.c,v 1.3 2023/04/14 14:23:05 tb Exp $ */ | 1 | /* $OpenBSD: exportertest.c,v 1.4 2024/03/01 03:46:54 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2022 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -534,6 +534,7 @@ exporter_test(size_t test_no, const struct exporter_test *et) | |||
| 534 | SSL_CTX *ssl_ctx = NULL; | 534 | SSL_CTX *ssl_ctx = NULL; |
| 535 | SSL *ssl = NULL; | 535 | SSL *ssl = NULL; |
| 536 | uint8_t export[256]; | 536 | uint8_t export[256]; |
| 537 | unsigned char id[2]; | ||
| 537 | int err, ret; | 538 | int err, ret; |
| 538 | int failed = 1; | 539 | int failed = 1; |
| 539 | 540 | ||
| @@ -602,7 +603,9 @@ exporter_test(size_t test_no, const struct exporter_test *et) | |||
| 602 | 603 | ||
| 603 | ssl->s3->hs.state = SSL_ST_OK; | 604 | ssl->s3->hs.state = SSL_ST_OK; |
| 604 | ssl->s3->hs.negotiated_tls_version = et->tls_version; | 605 | ssl->s3->hs.negotiated_tls_version = et->tls_version; |
| 605 | ssl->s3->hs.cipher = SSL_CIPHER_get_by_id(et->cipher_id); | 606 | id[0] = (et->cipher_id >> 8) & 0xff; |
| 607 | id[1] = et->cipher_id & 0xff; | ||
| 608 | ssl->s3->hs.cipher = SSL_CIPHER_find(ssl, id); | ||
| 606 | 609 | ||
| 607 | ret = SSL_export_keying_material(ssl, export, et->export_len, et->label, | 610 | ret = SSL_export_keying_material(ssl, export, et->export_len, et->label, |
| 608 | et->label_len, et->context_value, et->context_value_len, | 611 | et->label_len, et->context_value, et->context_value_len, |
