From 832152986545e8fc66f1ed5cf9d8bf518c7df2b3 Mon Sep 17 00:00:00 2001 From: Gary Lin Date: Wed, 15 Mar 2017 15:39:16 +0800 Subject: Update Cryptlib Update to edk2 commit 6e4489d8129d233ef0fe85eeb6eebfecafe9ea6e (CryptoPkg: Refine type cast for pointer subtraction) Also replaced CryptAes.c, CryptArc4.c, CryptTdes.c, CryptMd4.c, CryptHmacMd5.c, and CryptHmacSha1.c with the Null version since we don't really need those functions. Signed-off-by: Gary Lin --- Cryptlib/Pk/CryptAuthenticode.c | 4 ++-- Cryptlib/Pk/CryptPkcs7Verify.c | 8 ++++---- Cryptlib/Pk/CryptRsaBasic.c | 4 ++-- Cryptlib/Pk/CryptTs.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'Cryptlib/Pk') diff --git a/Cryptlib/Pk/CryptAuthenticode.c b/Cryptlib/Pk/CryptAuthenticode.c index 857281d7..74e50a2e 100644 --- a/Cryptlib/Pk/CryptAuthenticode.c +++ b/Cryptlib/Pk/CryptAuthenticode.c @@ -34,7 +34,7 @@ UINT8 mSpcIndirectOidValue[] = { }; /** - Verifies the validility of a PE/COFF Authenticode Signature as described in "Windows + Verifies the validity of a PE/COFF Authenticode Signature as described in "Windows Authenticode Portable Executable Signature Format". If AuthData is NULL, then return FALSE. @@ -50,7 +50,7 @@ UINT8 mSpcIndirectOidValue[] = { @param[in] TrustedCert Pointer to a trusted/root certificate encoded in DER, which is used for certificate chain verification. @param[in] CertSize Size of the trusted certificate in bytes. - @param[in] ImageHash Pointer to the original image file hash value. The procudure + @param[in] ImageHash Pointer to the original image file hash value. The procedure for calculating the image hash value is described in Authenticode specification. @param[in] HashSize Size of Image hash value in bytes. diff --git a/Cryptlib/Pk/CryptPkcs7Verify.c b/Cryptlib/Pk/CryptPkcs7Verify.c index 4dd16257..dcaba436 100644 --- a/Cryptlib/Pk/CryptPkcs7Verify.c +++ b/Cryptlib/Pk/CryptPkcs7Verify.c @@ -229,7 +229,7 @@ _Exit: in a ContentInfo structure. If P7Data, CertStack, StackLength, TrustedCert or CertLength is NULL, then - return FALSE. If P7Length overflow, then return FAlSE. + return FALSE. If P7Length overflow, then return FALSE. Caution: This function may receive untrusted input. UEFI Authenticated Variable is external input, so this function will do basic @@ -718,12 +718,12 @@ _Error: } /** - Verifies the validility of a PKCS#7 signed data as described in "PKCS #7: + Verifies the validity of a PKCS#7 signed data as described in "PKCS #7: Cryptographic Message Syntax Standard". The input signed data could be wrapped in a ContentInfo structure. If P7Data, TrustedCert or InData is NULL, then return FALSE. - If P7Length, CertLength or DataLength overflow, then return FAlSE. + If P7Length, CertLength or DataLength overflow, then return FALSE. Caution: This function may receive untrusted input. UEFI Authenticated Variable is external input, so this function will do basic @@ -897,7 +897,7 @@ _Exit: data could be wrapped in a ContentInfo structure. If P7Data, Content, or ContentSize is NULL, then return FALSE. If P7Length overflow, - then return FAlSE. If the P7Data is not correctly formatted, then return FALSE. + then return FALSE. If the P7Data is not correctly formatted, then return FALSE. Caution: This function may receive untrusted input. So this function will do basic check for PKCS#7 data structure. diff --git a/Cryptlib/Pk/CryptRsaBasic.c b/Cryptlib/Pk/CryptRsaBasic.c index e49db51e..e68dd024 100644 --- a/Cryptlib/Pk/CryptRsaBasic.c +++ b/Cryptlib/Pk/CryptRsaBasic.c @@ -67,14 +67,14 @@ RsaFree ( This function sets the tag-designated RSA key component into the established RSA context from the user-specified non-negative integer (octet string format represented in RSA PKCS#1). - If BigNumber is NULL, then the specified key componenet in RSA context is cleared. + If BigNumber is NULL, then the specified key component in RSA context is cleared. If RsaContext is NULL, then return FALSE. @param[in, out] RsaContext Pointer to RSA context being set. @param[in] KeyTag Tag of RSA key component being set. @param[in] BigNumber Pointer to octet integer buffer. - If NULL, then the specified key componenet in RSA + If NULL, then the specified key component in RSA context is cleared. @param[in] BnSize Size of big number buffer in bytes. If BigNumber is NULL, then it is ignored. diff --git a/Cryptlib/Pk/CryptTs.c b/Cryptlib/Pk/CryptTs.c index d4958122..1b78472f 100644 --- a/Cryptlib/Pk/CryptTs.c +++ b/Cryptlib/Pk/CryptTs.c @@ -323,7 +323,7 @@ _Exit: } /** - Verifies the validility of a TimeStamp Token as described in RFC 3161 ("Internet + Verifies the validity of a TimeStamp Token as described in RFC 3161 ("Internet X.509 Public Key Infrastructure Time-Stamp Protocol (TSP)"). If TSToken is NULL, then return FALSE. @@ -497,7 +497,7 @@ _Exit: } /** - Verifies the validility of a RFC3161 Timestamp CounterSignature embedded in PE/COFF Authenticode + Verifies the validity of a RFC3161 Timestamp CounterSignature embedded in PE/COFF Authenticode signature. If AuthData is NULL, then return FALSE. -- cgit v1.2.3