diff options
author | tb <> | 2020-03-16 15:25:14 +0000 |
---|---|---|
committer | tb <> | 2020-03-16 15:25:14 +0000 |
commit | afbeb5d666df4224373ad3c47cef95d0c68ed8d5 (patch) | |
tree | 618a5907f280250b761792adbc8ceb103d1a5999 /src/lib/libssl/ssl_locl.h | |
parent | dc99a0fd50f2ded1793b4651a9931696db2b6614 (diff) | |
download | openbsd-afbeb5d666df4224373ad3c47cef95d0c68ed8d5.tar.gz openbsd-afbeb5d666df4224373ad3c47cef95d0c68ed8d5.tar.bz2 openbsd-afbeb5d666df4224373ad3c47cef95d0c68ed8d5.zip |
Consistently spell 'unsigned' as 'unsigned int', as style(9) seems
to prefer that. No binary change except in d1_srtp.c where the
generated assembly differs only in line numbers (due to a wrapped
long line) and in s3_cbc.c where there is no change in the generated
assembly.
ok inoguchi jsing
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index f7b3868cd6..07240e31a2 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.270 2020/03/13 16:40:42 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.271 2020/03/16 15:25:14 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 | * |
@@ -1372,15 +1372,15 @@ int tls1_check_ec_server_key(SSL *s); | |||
1372 | 1372 | ||
1373 | /* s3_cbc.c */ | 1373 | /* s3_cbc.c */ |
1374 | void ssl3_cbc_copy_mac(unsigned char *out, const SSL3_RECORD_INTERNAL *rec, | 1374 | void ssl3_cbc_copy_mac(unsigned char *out, const SSL3_RECORD_INTERNAL *rec, |
1375 | unsigned md_size, unsigned orig_len); | 1375 | unsigned int md_size, unsigned int orig_len); |
1376 | int tls1_cbc_remove_padding(const SSL *s, SSL3_RECORD_INTERNAL *rec, | 1376 | int tls1_cbc_remove_padding(const SSL *s, SSL3_RECORD_INTERNAL *rec, |
1377 | unsigned block_size, unsigned mac_size); | 1377 | unsigned int block_size, unsigned int mac_size); |
1378 | char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx); | 1378 | char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx); |
1379 | int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out, | 1379 | int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out, |
1380 | size_t *md_out_size, const unsigned char header[13], | 1380 | size_t *md_out_size, const unsigned char header[13], |
1381 | const unsigned char *data, size_t data_plus_mac_size, | 1381 | const unsigned char *data, size_t data_plus_mac_size, |
1382 | size_t data_plus_mac_plus_padding_size, const unsigned char *mac_secret, | 1382 | size_t data_plus_mac_plus_padding_size, const unsigned char *mac_secret, |
1383 | unsigned mac_secret_length); | 1383 | unsigned int mac_secret_length); |
1384 | int SSL_state_func_code(int _state); | 1384 | int SSL_state_func_code(int _state); |
1385 | 1385 | ||
1386 | #define SSLerror(s, r) SSL_error_internal(s, r, __FILE__, __LINE__) | 1386 | #define SSLerror(s, r) SSL_error_internal(s, r, __FILE__, __LINE__) |
@@ -1390,8 +1390,8 @@ void SSL_error_internal(const SSL *s, int r, char *f, int l); | |||
1390 | #ifndef OPENSSL_NO_SRTP | 1390 | #ifndef OPENSSL_NO_SRTP |
1391 | 1391 | ||
1392 | int srtp_find_profile_by_name(char *profile_name, | 1392 | int srtp_find_profile_by_name(char *profile_name, |
1393 | SRTP_PROTECTION_PROFILE **pptr, unsigned len); | 1393 | SRTP_PROTECTION_PROFILE **pptr, unsigned int len); |
1394 | int srtp_find_profile_by_num(unsigned profile_num, | 1394 | int srtp_find_profile_by_num(unsigned int profile_num, |
1395 | SRTP_PROTECTION_PROFILE **pptr); | 1395 | SRTP_PROTECTION_PROFILE **pptr); |
1396 | 1396 | ||
1397 | #endif /* OPENSSL_NO_SRTP */ | 1397 | #endif /* OPENSSL_NO_SRTP */ |