diff options
| author | tb <> | 2023-11-29 13:29:34 +0000 |
|---|---|---|
| committer | tb <> | 2023-11-29 13:29:34 +0000 |
| commit | 49adf1fb564c33009eb18992e86dac6577364047 (patch) | |
| tree | 999c123bc2deb7b99efd503a35c73c07b0a7a7e8 /src/lib/libssl | |
| parent | 2ef851529997e0374d16c3733749d9cfb616a768 (diff) | |
| download | openbsd-49adf1fb564c33009eb18992e86dac6577364047.tar.gz openbsd-49adf1fb564c33009eb18992e86dac6577364047.tar.bz2 openbsd-49adf1fb564c33009eb18992e86dac6577364047.zip | |
Use a long for id in ssl3_get_cipher_by_id()
While the cipher id is effectively a 32-bit value, someone decided that
it should be represented by a long in various internal structs, whose
mameber is passed as id. So use a long because of this and also to make
an upcoming diff simpler.
ok jsing
Diffstat (limited to 'src/lib/libssl')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_local.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 7ab6880131..9ac02f3e1b 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.246 2023/07/08 16:40:13 beck Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.247 2023/11/29 13:29:34 tb 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 | * |
| @@ -1414,7 +1414,7 @@ ssl3_get_cipher(unsigned int u) | |||
| 1414 | } | 1414 | } |
| 1415 | 1415 | ||
| 1416 | const SSL_CIPHER * | 1416 | const SSL_CIPHER * |
| 1417 | ssl3_get_cipher_by_id(unsigned int id) | 1417 | ssl3_get_cipher_by_id(unsigned long id) |
| 1418 | { | 1418 | { |
| 1419 | const SSL_CIPHER *cp; | 1419 | const SSL_CIPHER *cp; |
| 1420 | SSL_CIPHER c; | 1420 | SSL_CIPHER c; |
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index a3007eae2c..3c5fb204b0 100644 --- a/src/lib/libssl/ssl_local.h +++ b/src/lib/libssl/ssl_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_local.h,v 1.9 2023/11/25 12:05:08 tb Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.10 2023/11/29 13:29:34 tb 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 | * |
| @@ -1344,7 +1344,7 @@ int ssl3_get_req_cert_types(SSL *s, CBB *cbb); | |||
| 1344 | int ssl3_get_message(SSL *s, int st1, int stn, int mt, long max); | 1344 | int ssl3_get_message(SSL *s, int st1, int stn, int mt, long max); |
| 1345 | int ssl3_num_ciphers(void); | 1345 | int ssl3_num_ciphers(void); |
| 1346 | const SSL_CIPHER *ssl3_get_cipher(unsigned int u); | 1346 | const SSL_CIPHER *ssl3_get_cipher(unsigned int u); |
| 1347 | const SSL_CIPHER *ssl3_get_cipher_by_id(unsigned int id); | 1347 | const SSL_CIPHER *ssl3_get_cipher_by_id(unsigned long id); |
| 1348 | const SSL_CIPHER *ssl3_get_cipher_by_value(uint16_t value); | 1348 | const SSL_CIPHER *ssl3_get_cipher_by_value(uint16_t value); |
| 1349 | uint16_t ssl3_cipher_get_value(const SSL_CIPHER *c); | 1349 | uint16_t ssl3_cipher_get_value(const SSL_CIPHER *c); |
| 1350 | int ssl3_renegotiate(SSL *ssl); | 1350 | int ssl3_renegotiate(SSL *ssl); |