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 @@
|
|||
#! /usr/bin/env perl
|
||||
# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
# Copyright 2005-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
|
||||
|
@ -69,19 +69,19 @@ sub LL()
|
|||
unshift(@_,pop(@_));
|
||||
}
|
||||
}
|
||||
else { die "unvalid SCALE value"; }
|
||||
else { die "invalid SCALE value"; }
|
||||
}
|
||||
|
||||
sub scale()
|
||||
{ if ($SCALE==2) { &lea(@_[0],&DWP(0,@_[1],@_[1])); }
|
||||
elsif ($SCALE==8) { &lea(@_[0],&DWP(0,"",@_[1],8)); }
|
||||
else { die "unvalid SCALE value"; }
|
||||
else { die "invalid SCALE value"; }
|
||||
}
|
||||
|
||||
sub row()
|
||||
{ if ($SCALE==2) { ((8-shift)&7); }
|
||||
elsif ($SCALE==8) { (8*shift); }
|
||||
else { die "unvalid SCALE value"; }
|
||||
else { die "invalid SCALE value"; }
|
||||
}
|
||||
|
||||
$tbl="ebp";
|
||||
|
@ -504,4 +504,4 @@ for($i=0;$i<8;$i++) {
|
|||
&function_end_B("whirlpool_block_mmx");
|
||||
&asm_finish();
|
||||
|
||||
close STDOUT;
|
||||
close STDOUT or die "error closing STDOUT: $!";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env perl
|
||||
# Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
# Copyright 2005-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
|
||||
|
@ -614,4 +614,4 @@ ___
|
|||
|
||||
$code =~ s/\`([^\`]*)\`/eval $1/gem;
|
||||
print $code;
|
||||
close STDOUT;
|
||||
close STDOUT or die "error closing STDOUT: $!";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 2005-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
|
||||
|
@ -36,7 +36,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "wp_locl.h"
|
||||
#include "wp_local.h"
|
||||
#include <string.h>
|
||||
|
||||
typedef unsigned char u8;
|
||||
|
@ -63,6 +63,20 @@ typedef unsigned long long u64;
|
|||
# undef STRICT_ALIGNMENT
|
||||
#endif
|
||||
|
||||
#ifndef STRICT_ALIGNMENT
|
||||
# ifdef __GNUC__
|
||||
typedef u64 u64_a1 __attribute((__aligned__(1)));
|
||||
# else
|
||||
typedef u64 u64_a1;
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && !defined(STRICT_ALIGNMENT)
|
||||
typedef u64 u64_aX __attribute((__aligned__(1)));
|
||||
#else
|
||||
typedef u64 u64_aX;
|
||||
#endif
|
||||
|
||||
#undef SMALL_REGISTER_BANK
|
||||
#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
|
||||
# define SMALL_REGISTER_BANK
|
||||
|
@ -87,6 +101,7 @@ typedef unsigned long long u64;
|
|||
#ifndef PEDANTIC
|
||||
# if defined(_MSC_VER)
|
||||
# if defined(_WIN64) /* applies to both IA-64 and AMD64 */
|
||||
# include <stdlib.h>
|
||||
# pragma intrinsic(_rotl64)
|
||||
# define ROTATE(a,n) _rotl64((a),n)
|
||||
# endif
|
||||
|
@ -190,13 +205,13 @@ typedef unsigned long long u64;
|
|||
# define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
|
||||
c0,c1,c2,c3,c4,c5,c6,c7
|
||||
# define C0(K,i) (((u64*)(Cx.c+0))[2*K.c[(i)*8+0]])
|
||||
# define C1(K,i) (((u64*)(Cx.c+7))[2*K.c[(i)*8+1]])
|
||||
# define C2(K,i) (((u64*)(Cx.c+6))[2*K.c[(i)*8+2]])
|
||||
# define C3(K,i) (((u64*)(Cx.c+5))[2*K.c[(i)*8+3]])
|
||||
# define C4(K,i) (((u64*)(Cx.c+4))[2*K.c[(i)*8+4]])
|
||||
# define C5(K,i) (((u64*)(Cx.c+3))[2*K.c[(i)*8+5]])
|
||||
# define C6(K,i) (((u64*)(Cx.c+2))[2*K.c[(i)*8+6]])
|
||||
# define C7(K,i) (((u64*)(Cx.c+1))[2*K.c[(i)*8+7]])
|
||||
# define C1(K,i) (((u64_a1*)(Cx.c+7))[2*K.c[(i)*8+1]])
|
||||
# define C2(K,i) (((u64_a1*)(Cx.c+6))[2*K.c[(i)*8+2]])
|
||||
# define C3(K,i) (((u64_a1*)(Cx.c+5))[2*K.c[(i)*8+3]])
|
||||
# define C4(K,i) (((u64_a1*)(Cx.c+4))[2*K.c[(i)*8+4]])
|
||||
# define C5(K,i) (((u64_a1*)(Cx.c+3))[2*K.c[(i)*8+5]])
|
||||
# define C6(K,i) (((u64_a1*)(Cx.c+2))[2*K.c[(i)*8+6]])
|
||||
# define C7(K,i) (((u64_a1*)(Cx.c+1))[2*K.c[(i)*8+7]])
|
||||
#endif
|
||||
|
||||
static const
|
||||
|
@ -530,7 +545,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
|
|||
} else
|
||||
# endif
|
||||
{
|
||||
const u64 *pa = (const u64 *)p;
|
||||
const u64_aX *pa = (const u64_aX *)p;
|
||||
S.q[0] = (K.q[0] = H->q[0]) ^ pa[0];
|
||||
S.q[1] = (K.q[1] = H->q[1]) ^ pa[1];
|
||||
S.q[2] = (K.q[2] = H->q[2]) ^ pa[2];
|
||||
|
@ -768,7 +783,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
|
|||
} else
|
||||
# endif
|
||||
{
|
||||
const u64 *pa = (const u64 *)p;
|
||||
const u64_aX *pa = (const u64_aX *)p;
|
||||
H->q[0] ^= S.q[0] ^ pa[0];
|
||||
H->q[1] ^= S.q[1] ^ pa[1];
|
||||
H->q[2] ^= S.q[2] ^ pa[2];
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
*/
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include "wp_locl.h"
|
||||
#include "wp_local.h"
|
||||
#include <string.h>
|
||||
|
||||
int WHIRLPOOL_Init(WHIRLPOOL_CTX *c)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue