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
|
@ -17,8 +17,8 @@
|
|||
#include <openssl/safestack.h>
|
||||
#include <openssl/e_os2.h>
|
||||
#include "internal/thread_once.h"
|
||||
#include "internal/lhash.h"
|
||||
#include "obj_lcl.h"
|
||||
#include "crypto/lhash.h"
|
||||
#include "obj_local.h"
|
||||
#include "e_os.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -8,15 +8,15 @@
|
|||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "internal/ctype.h"
|
||||
#include "crypto/ctype.h"
|
||||
#include <limits.h>
|
||||
#include "internal/cryptlib.h"
|
||||
#include <openssl/lhash.h>
|
||||
#include <openssl/asn1.h>
|
||||
#include "internal/objects.h"
|
||||
#include "crypto/objects.h"
|
||||
#include <openssl/bn.h>
|
||||
#include "internal/asn1_int.h"
|
||||
#include "obj_lcl.h"
|
||||
#include "crypto/asn1.h"
|
||||
#include "obj_local.h"
|
||||
|
||||
/* obj_dat.h is generated from objects.h by obj_dat.pl */
|
||||
#include "obj_dat.h"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* WARNING: do not edit!
|
||||
* Generated by crypto/objects/obj_dat.pl
|
||||
*
|
||||
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2021 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
|
||||
* in the file LICENSE in the source distribution or at
|
||||
|
@ -1070,7 +1070,7 @@ static const unsigned char so[7762] = {
|
|||
0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01, /* [ 7684] OBJ_id_tc26_wrap_gostr3412_2015_magma */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01,0x01, /* [ 7692] OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x02, /* [ 7701] OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01,0x01, /* [ 7709] OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x02,0x01, /* [ 7709] OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x02, /* [ 7718] OBJ_id_tc26_gost_3410_2012_256_paramSetB */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x03, /* [ 7727] OBJ_id_tc26_gost_3410_2012_256_paramSetC */
|
||||
0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x04, /* [ 7736] OBJ_id_tc26_gost_3410_2012_256_paramSetD */
|
||||
|
@ -1728,8 +1728,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
|
|||
{"ITU-T", "itu-t", NID_itu_t},
|
||||
{"JOINT-ISO-ITU-T", "joint-iso-itu-t", NID_joint_iso_itu_t},
|
||||
{"international-organizations", "International Organizations", NID_international_organizations, 1, &so[4439]},
|
||||
{"msSmartcardLogin", "Microsoft Smartcardlogin", NID_ms_smartcard_login, 10, &so[4440]},
|
||||
{"msUPN", "Microsoft Universal Principal Name", NID_ms_upn, 10, &so[4450]},
|
||||
{"msSmartcardLogin", "Microsoft Smartcard Login", NID_ms_smartcard_login, 10, &so[4440]},
|
||||
{"msUPN", "Microsoft User Principal Name", NID_ms_upn, 10, &so[4450]},
|
||||
{"AES-128-CFB1", "aes-128-cfb1", NID_aes_128_cfb1},
|
||||
{"AES-192-CFB1", "aes-192-cfb1", NID_aes_192_cfb1},
|
||||
{"AES-256-CFB1", "aes-256-cfb1", NID_aes_256_cfb1},
|
||||
|
@ -3578,9 +3578,9 @@ static const unsigned int ln_objs[NUM_LN] = {
|
|||
134, /* "Microsoft Individual Code Signing" */
|
||||
856, /* "Microsoft Local Key set" */
|
||||
137, /* "Microsoft Server Gated Crypto" */
|
||||
648, /* "Microsoft Smartcardlogin" */
|
||||
648, /* "Microsoft Smartcard Login" */
|
||||
136, /* "Microsoft Trust List Signing" */
|
||||
649, /* "Microsoft Universal Principal Name" */
|
||||
649, /* "Microsoft User Principal Name" */
|
||||
393, /* "NULL" */
|
||||
404, /* "NULL" */
|
||||
72, /* "Netscape Base Url" */
|
||||
|
@ -5364,7 +5364,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
|
|||
1177, /* OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm 1 2 643 7 1 1 5 2 1 */
|
||||
1178, /* OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac 1 2 643 7 1 1 5 2 2 */
|
||||
1181, /* OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 1 2 643 7 1 1 7 1 1 */
|
||||
1183, /* OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 1 2 643 7 1 1 7 1 1 */
|
||||
1183, /* OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 1 2 643 7 1 1 7 2 1 */
|
||||
1148, /* OBJ_id_tc26_gost_3410_2012_256_paramSetA 1 2 643 7 1 2 1 1 1 */
|
||||
1184, /* OBJ_id_tc26_gost_3410_2012_256_paramSetB 1 2 643 7 1 2 1 1 2 */
|
||||
1185, /* OBJ_id_tc26_gost_3410_2012_256_paramSetC 1 2 643 7 1 2 1 1 3 */
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include "internal/cryptlib.h"
|
||||
#include <openssl/objects.h>
|
||||
#include <openssl/buffer.h>
|
||||
#include "internal/asn1_int.h"
|
||||
#include "crypto/asn1.h"
|
||||
|
||||
ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* WARNING: do not edit!
|
||||
* Generated by objxref.pl
|
||||
*
|
||||
* Copyright 1998-2019 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1998-2021 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
|
||||
|
|
|
@ -426,9 +426,9 @@ rsadsi 3 8 : RC5-CBC : rc5-cbc
|
|||
!Cname ms-efs
|
||||
1 3 6 1 4 1 311 10 3 4 : msEFS : Microsoft Encrypted File System
|
||||
!Cname ms-smartcard-login
|
||||
1 3 6 1 4 1 311 20 2 2 : msSmartcardLogin : Microsoft Smartcardlogin
|
||||
1 3 6 1 4 1 311 20 2 2 : msSmartcardLogin : Microsoft Smartcard Login
|
||||
!Cname ms-upn
|
||||
1 3 6 1 4 1 311 20 2 3 : msUPN : Microsoft Universal Principal Name
|
||||
1 3 6 1 4 1 311 20 2 3 : msUPN : Microsoft User Principal Name
|
||||
|
||||
1 3 6 1 4 1 188 7 1 1 2 : IDEA-CBC : idea-cbc
|
||||
: IDEA-ECB : idea-ecb
|
||||
|
@ -1358,7 +1358,7 @@ id-tc26-algorithms 7 : id-tc26-wrap
|
|||
id-tc26-wrap 1 : id-tc26-wrap-gostr3412-2015-magma
|
||||
id-tc26-wrap-gostr3412-2015-magma 1 : id-tc26-wrap-gostr3412-2015-magma-kexp15
|
||||
id-tc26-wrap 2 : id-tc26-wrap-gostr3412-2015-kuznyechik
|
||||
id-tc26-wrap-gostr3412-2015-magma 1 : id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15
|
||||
id-tc26-wrap-gostr3412-2015-kuznyechik 1 : id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15
|
||||
|
||||
id-tc26 2 : id-tc26-constants
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue