mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
AppleM1: Update openssl to v1.1.1l
This commit is contained in:
parent
1fe12b8e8c
commit
b787656eea
990 changed files with 13406 additions and 18710 deletions
30
trunk/3rdparty/openssl-1.1-fit/ssl/t1_trce.c
vendored
30
trunk/3rdparty/openssl-1.1-fit/ssl/t1_trce.c
vendored
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2012-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
|
@ -7,7 +7,7 @@
|
|||
* https://www.openssl.org/source/license.html
|
||||
*/
|
||||
|
||||
#include "ssl_locl.h"
|
||||
#include "ssl_local.h"
|
||||
|
||||
#ifndef OPENSSL_NO_SSL_TRACE
|
||||
|
||||
|
@ -656,7 +656,10 @@ static int ssl_print_random(BIO *bio, int indent,
|
|||
|
||||
if (*pmsglen < 32)
|
||||
return 0;
|
||||
tm = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
|
||||
tm = ((unsigned int)p[0] << 24)
|
||||
| ((unsigned int)p[1] << 16)
|
||||
| ((unsigned int)p[2] << 8)
|
||||
| (unsigned int)p[3];
|
||||
p += 4;
|
||||
BIO_indent(bio, indent, 80);
|
||||
BIO_puts(bio, "Random:\n");
|
||||
|
@ -864,8 +867,10 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
|
|||
break;
|
||||
if (extlen != 4)
|
||||
return 0;
|
||||
max_early_data = (ext[0] << 24) | (ext[1] << 16) | (ext[2] << 8)
|
||||
| ext[3];
|
||||
max_early_data = ((unsigned int)ext[0] << 24)
|
||||
| ((unsigned int)ext[1] << 16)
|
||||
| ((unsigned int)ext[2] << 8)
|
||||
| (unsigned int)ext[3];
|
||||
BIO_indent(bio, indent + 2, 80);
|
||||
BIO_printf(bio, "max_early_data=%u\n", max_early_data);
|
||||
break;
|
||||
|
@ -1246,8 +1251,9 @@ static int ssl_print_certificates(BIO *bio, const SSL *ssl, int server,
|
|||
while (clen > 0) {
|
||||
if (!ssl_print_certificate(bio, indent + 2, &msg, &clen))
|
||||
return 0;
|
||||
if (!ssl_print_extensions(bio, indent + 2, server, SSL3_MT_CERTIFICATE,
|
||||
&msg, &clen))
|
||||
if (SSL_IS_TLS13(ssl)
|
||||
&& !ssl_print_extensions(bio, indent + 2, server,
|
||||
SSL3_MT_CERTIFICATE, &msg, &clen))
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
@ -1355,7 +1361,10 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL *ssl,
|
|||
}
|
||||
if (msglen < 4)
|
||||
return 0;
|
||||
tick_life = (msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3];
|
||||
tick_life = ((unsigned int)msg[0] << 24)
|
||||
| ((unsigned int)msg[1] << 16)
|
||||
| ((unsigned int)msg[2] << 8)
|
||||
| (unsigned int)msg[3];
|
||||
msglen -= 4;
|
||||
msg += 4;
|
||||
BIO_indent(bio, indent + 2, 80);
|
||||
|
@ -1366,7 +1375,10 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL *ssl,
|
|||
if (msglen < 4)
|
||||
return 0;
|
||||
ticket_age_add =
|
||||
(msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3];
|
||||
((unsigned int)msg[0] << 24)
|
||||
| ((unsigned int)msg[1] << 16)
|
||||
| ((unsigned int)msg[2] << 8)
|
||||
| (unsigned int)msg[3];
|
||||
msglen -= 4;
|
||||
msg += 4;
|
||||
BIO_indent(bio, indent + 2, 80);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue