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
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2006-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
|
||||
|
@ -14,7 +14,7 @@
|
|||
#include <openssl/ts.h>
|
||||
#include <openssl/pkcs7.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include "ts_lcl.h"
|
||||
#include "ts_local.h"
|
||||
|
||||
static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
|
||||
static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec);
|
||||
|
@ -57,12 +57,14 @@ static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
|
|||
goto err;
|
||||
if (!ASN1_INTEGER_set(serial, 1))
|
||||
goto err;
|
||||
|
||||
return serial;
|
||||
|
||||
err:
|
||||
TSerr(TS_F_DEF_SERIAL_CB, ERR_R_MALLOC_FAILURE);
|
||||
TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
|
||||
"Error during serial number generation.");
|
||||
ASN1_INTEGER_free(serial);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -771,7 +773,8 @@ static ESS_CERT_ID *ess_CERT_ID_new_init(X509 *cert, int issuer_needed)
|
|||
X509_check_purpose(cert, -1, 0);
|
||||
if ((cid = ESS_CERT_ID_new()) == NULL)
|
||||
goto err;
|
||||
X509_digest(cert, EVP_sha1(), cert_sha1, NULL);
|
||||
if (!X509_digest(cert, EVP_sha1(), cert_sha1, NULL))
|
||||
goto err;
|
||||
if (!ASN1_OCTET_STRING_set(cid->hash, cert_sha1, SHA_DIGEST_LENGTH))
|
||||
goto err;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue