CryptoPkg Updates to support RFC3161 timestamp signature verification.
The main changes includes: 1. Enabling SHA384 and SHA512 digest algorithm; (Sha512.c) 2. RFC 3161 timestamp signature verification support; (CryptTs.c) 3. Fixed one ASN.1 length encoding issue in Authenticode verification routine. (CryptAuthenticode.c) 4. Add the corresponding test cases in Cryptest utility (SHA384 & SHA512 & Timestamp verification) Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long <qin.long@intel.com> Reviewed-by: Guo Dong <guo.dong@intel.com> Reviewed-by: Ting Ye <ting.ye@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16339 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
62
CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.S
Normal file
62
CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.S
Normal file
@@ -0,0 +1,62 @@
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
# which accompanies this distribution. The full text of the license may be found at
|
||||
# http://opensource.org/licenses/bsd-license.php.
|
||||
#
|
||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#
|
||||
# Module Name:
|
||||
#
|
||||
# MathLShiftS64.S
|
||||
#
|
||||
# Abstract:
|
||||
#
|
||||
# 64-bit Math Worker Function.
|
||||
# Shifts a 64-bit signed value left by a certain number of bits.
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
.686:
|
||||
.code:
|
||||
|
||||
ASM_GLOBAL ASM_PFX(__ashldi3)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# void __cdecl __ashldi3 (void)
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
ASM_PFX(__ashldi3):
|
||||
#
|
||||
# Handle shifting of 64 or more bits (return 0)
|
||||
#
|
||||
cmpb $64, %cl
|
||||
jae ReturnZero
|
||||
|
||||
#
|
||||
# Handle shifting of between 0 and 31 bits
|
||||
#
|
||||
cmpb $32, %cl
|
||||
jae More32
|
||||
shld %cl, %eax, %edx
|
||||
shl %cl, %eax
|
||||
ret
|
||||
|
||||
#
|
||||
# Handle shifting of between 32 and 63 bits
|
||||
#
|
||||
More32:
|
||||
movl %eax, %edx
|
||||
xor %eax, %eax
|
||||
and $31, %cl
|
||||
shl %cl, %edx
|
||||
ret
|
||||
|
||||
ReturnZero:
|
||||
xor %eax, %eax
|
||||
xor %edx, %edx
|
||||
ret
|
54
CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
Normal file
54
CryptoPkg/Library/IntrinsicLib/Ia32/MathLShiftS64.c
Normal file
@@ -0,0 +1,54 @@
|
||||
/** @file
|
||||
64-bit Math Worker Function.
|
||||
The 32-bit versions of C compiler generate calls to library routines
|
||||
to handle 64-bit math. These functions use non-standard calling conventions.
|
||||
|
||||
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
**/
|
||||
|
||||
|
||||
/*
|
||||
* Shifts a 64-bit signed value left by a particular number of bits.
|
||||
*/
|
||||
__declspec(naked) void __cdecl _allshl (void)
|
||||
{
|
||||
_asm {
|
||||
;
|
||||
; Handle shifting of 64 or more bits (return 0)
|
||||
;
|
||||
cmp cl, 64
|
||||
jae short ReturnZero
|
||||
|
||||
;
|
||||
; Handle shifting of between 0 and 31 bits
|
||||
;
|
||||
cmp cl, 32
|
||||
jae short More32
|
||||
shld edx, eax, cl
|
||||
shl eax, cl
|
||||
ret
|
||||
|
||||
;
|
||||
; Handle shifting of between 32 and 63 bits
|
||||
;
|
||||
More32:
|
||||
mov edx, eax
|
||||
xor eax, eax
|
||||
and cl, 31
|
||||
shl edx, cl
|
||||
ret
|
||||
|
||||
ReturnZero:
|
||||
xor eax,eax
|
||||
xor edx,edx
|
||||
ret
|
||||
}
|
||||
}
|
66
CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.S
Normal file
66
CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.S
Normal file
@@ -0,0 +1,66 @@
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
# which accompanies this distribution. The full text of the license may be found at
|
||||
# http://opensource.org/licenses/bsd-license.php.
|
||||
#
|
||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#
|
||||
# Module Name:
|
||||
#
|
||||
# MathRShiftU64.S
|
||||
#
|
||||
# Abstract:
|
||||
#
|
||||
# 64-bit Math Worker Function.
|
||||
# Shifts a 64-bit unsigned value right by a certain number of bits.
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
.686:
|
||||
.code:
|
||||
|
||||
ASM_GLOBAL ASM_PFX(__ashrdi3)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# void __cdecl __ashrdi3 (void)
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
ASM_PFX(__ashrdi3):
|
||||
#
|
||||
# Checking: Only handle 64bit shifting or more
|
||||
#
|
||||
cmpb $64, %cl
|
||||
jae _Exit
|
||||
|
||||
#
|
||||
# Handle shifting between 0 and 31 bits
|
||||
#
|
||||
cmpb $32, %cl
|
||||
jae More32
|
||||
shrd %cl, %edx, %eax
|
||||
shr %cl, %edx
|
||||
ret
|
||||
|
||||
#
|
||||
# Handle shifting of 32-63 bits
|
||||
#
|
||||
More32:
|
||||
movl %edx, %eax
|
||||
xor %edx, %edx
|
||||
and $31, %cl
|
||||
shr %cl, %eax
|
||||
ret
|
||||
|
||||
#
|
||||
# Invalid number (less then 32bits), return 0
|
||||
#
|
||||
_Exit:
|
||||
xor %eax, %eax
|
||||
xor %edx, %edx
|
||||
ret
|
57
CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
Normal file
57
CryptoPkg/Library/IntrinsicLib/Ia32/MathRShiftU64.c
Normal file
@@ -0,0 +1,57 @@
|
||||
/** @file
|
||||
64-bit Math Worker Function.
|
||||
The 32-bit versions of C compiler generate calls to library routines
|
||||
to handle 64-bit math. These functions use non-standard calling conventions.
|
||||
|
||||
Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
**/
|
||||
|
||||
|
||||
/*
|
||||
* Shifts a 64-bit unsigned value right by a certain number of bits.
|
||||
*/
|
||||
__declspec(naked) void __cdecl _aullshr (void)
|
||||
{
|
||||
_asm {
|
||||
;
|
||||
; Checking: Only handle 64bit shifting or more
|
||||
;
|
||||
cmp cl, 64
|
||||
jae _Exit
|
||||
|
||||
;
|
||||
; Handle shifting between 0 and 31 bits
|
||||
;
|
||||
cmp cl, 32
|
||||
jae More32
|
||||
shrd eax, edx, cl
|
||||
shr edx, cl
|
||||
ret
|
||||
|
||||
;
|
||||
; Handle shifting of 32-63 bits
|
||||
;
|
||||
More32:
|
||||
mov eax, edx
|
||||
xor edx, edx
|
||||
and cl, 31
|
||||
shr eax, cl
|
||||
ret
|
||||
|
||||
;
|
||||
; Invalid number (less then 32bits), return 0
|
||||
;
|
||||
_Exit:
|
||||
xor eax, eax
|
||||
xor edx, edx
|
||||
ret
|
||||
}
|
||||
}
|
@@ -6,10 +6,10 @@
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
# which accompanies this distribution. The full text of the license may be found at
|
||||
# http://opensource.org/licenses/bsd-license.php
|
||||
#
|
||||
#
|
||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#
|
||||
#
|
||||
##
|
||||
|
||||
[Defines]
|
||||
@@ -33,6 +33,15 @@
|
||||
[Sources.IA32]
|
||||
CopyMem.c
|
||||
|
||||
Ia32/MathLShiftS64.c | MSFT
|
||||
Ia32/MathRShiftU64.c | MSFT
|
||||
|
||||
Ia32/MathLShiftS64.c | INTEL
|
||||
Ia32/MathRShiftU64.c | INTEL
|
||||
|
||||
Ia32/MathLShiftS64.S | GCC
|
||||
Ia32/MathRShiftU64.S | GCC
|
||||
|
||||
[Sources.X64]
|
||||
CopyMem.c
|
||||
|
||||
@@ -70,4 +79,4 @@
|
||||
MSFT:DEBUG_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32 /Zi
|
||||
MSFT:RELEASE_*_IPF_CC_FLAGS == /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /Os /FIAutoGen.h /QIPF_fr32
|
||||
INTEL:*_*_*_CC_FLAGS = /Oi-
|
||||
GCC:*_*_*_CC_FLAGS = -fno-builtin
|
||||
GCC:*_*_*_CC_FLAGS = -fno-builtin
|
Reference in New Issue
Block a user