Openssl3.5.0 merge

Cryptlib/Base.h

@@ -0,0 +1,67 @@
+
+#pragma once
+
+//
+// Status codes common to all execution phases
+//
+typedef UINTN RETURN_STATUS;
+
+//
+// The Microsoft* C compiler can removed references to unreferenced data items
+//  if the /OPT:REF linker option is used. We defined a macro as this is a
+//  a non standard extension
+//
+#if defined (_MSC_VER) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC)
+///
+/// Remove global variable from the linked image if there are no references to
+/// it after all compiler and linker optimizations have been performed.
+///
+///
+#define GLOBAL_REMOVE_IF_UNREFERENCED  __declspec(selectany)
+#else
+///
+/// Remove the global variable from the linked image if there are no references
+///  to it after all compiler and linker optimizations have been performed.
+///
+///
+#define GLOBAL_REMOVE_IF_UNREFERENCED
+#endif
+
+/**
+  Returns a 16-bit signature built from 2 ASCII characters.
+
+  This macro returns a 16-bit value built from the two ASCII characters specified
+  by A and B.
+
+  @param  A    The first ASCII character.
+  @param  B    The second ASCII character.
+
+  @return A 16-bit value built from the two ASCII characters specified by A and B.
+
+**/
+#ifdef SIGNATURE_16
+#undef SIGNATURE_16
+#endif
+#define SIGNATURE_16(A, B)  ((A) | (B << 8))
+
+/**
+  Returns a 32-bit signature built from 4 ASCII characters.
+
+  This macro returns a 32-bit value built from the four ASCII characters specified
+  by A, B, C, and D.
+
+  @param  A    The first ASCII character.
+  @param  B    The second ASCII character.
+  @param  C    The third ASCII character.
+  @param  D    The fourth ASCII character.
+
+  @return A 32-bit value built from the two ASCII characters specified by A, B,
+          C and D.
+
+**/
+#ifdef SIGNATURE_32
+#undef SIGNATURE_32
+#endif
+#define SIGNATURE_32(A, B, C, D)  (SIGNATURE_16 (A, B) | (SIGNATURE_16 (C, D) << 16))
+
+#define MIN(a, b) ({(a) < (b) ? (a) : (b);})

Cryptlib/Cipher/CryptAesNull.c

@@ -1,14 +1,8 @@
 /** @file
-  AES Wrapper Implementation which does not provide real capabilities.  
-
-Copyright (c) 2012, 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
+  AES Wrapper Implementation which does not provide real capabilities.
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -56,58 +50,6 @@ AesInit (
   return FALSE;
 }
 
-/**
-  Performs AES encryption on a data buffer of the specified size in ECB mode.
-
-  Return FALSE to indicate this interface is not supported.
-
-  @param[in]   AesContext  Pointer to the AES context.
-  @param[in]   Input       Pointer to the buffer containing the data to be encrypted.
-  @param[in]   InputSize   Size of the Input buffer in bytes.
-  @param[out]  Output      Pointer to a buffer that receives the AES encryption output.
-
-  @retval FALSE  This interface is not supported.
-
-**/
-BOOLEAN
-EFIAPI
-AesEcbEncrypt (
-  IN   VOID         *AesContext,
-  IN   CONST UINT8  *Input,
-  IN   UINTN        InputSize,
-  OUT  UINT8        *Output
-  )
-{
-  ASSERT (FALSE);
-  return FALSE;
-}
-
-/**
-  Performs AES decryption on a data buffer of the specified size in ECB mode.
-
-  Return FALSE to indicate this interface is not supported.
-
-  @param[in]   AesContext  Pointer to the AES context.
-  @param[in]   Input       Pointer to the buffer containing the data to be decrypted.
-  @param[in]   InputSize   Size of the Input buffer in bytes.
-  @param[out]  Output      Pointer to a buffer that receives the AES decryption output.
-
-  @retval FALSE  This interface is not supported.
-
-**/
-BOOLEAN
-EFIAPI
-AesEcbDecrypt (
-  IN   VOID         *AesContext,
-  IN   CONST UINT8  *Input,
-  IN   UINTN        InputSize,
-  OUT  UINT8        *Output
-  )
-{
-  ASSERT (FALSE);
-  return FALSE;
-}
-
 /**
   Performs AES encryption on a data buffer of the specified size in CBC mode.
 
@@ -159,7 +101,7 @@ AesCbcDecrypt (
   IN   CONST UINT8  *Ivec,
   OUT  UINT8        *Output
   )
-{  
+{
   ASSERT (FALSE);
   return FALSE;
 }

Cryptlib/Hash/CryptMd5.c

@@ -2,19 +2,14 @@
   MD5 Digest Wrapper Implementation over OpenSSL.
 
 Copyright (c) 2009 - 2016, 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.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "InternalCryptLib.h"
 #include <openssl/md5.h>
 
+#ifdef ENABLE_MD5_DEPRECATED_INTERFACES
 
 /**
   Retrieves the size, in bytes, of the context buffer required for MD5 hash operations.
@@ -31,10 +26,9 @@ Md5GetContextSize (
   //
   // Retrieves the OpenSSL MD5 Context Size
   //
-  return (UINTN) (sizeof (MD5_CTX));
+  return (UINTN)(sizeof (MD5_CTX));
 }
 
-
 /**
   Initializes user-supplied memory pointed by Md5Context as MD5 hash context for
   subsequent use.
@@ -63,7 +57,7 @@ Md5Init (
   //
   // OpenSSL MD5 Context Initialization
   //
-  return (BOOLEAN) (MD5_Init ((MD5_CTX *) Md5Context));
+  return (BOOLEAN)(MD5_Init ((MD5_CTX *)Md5Context));
 }
 
 /**
@@ -89,11 +83,11 @@ Md5Duplicate (
   //
   // Check input parameters.
   //
-  if (Md5Context == NULL || NewMd5Context == NULL) {
+  if ((Md5Context == NULL) || (NewMd5Context == NULL)) {
     return FALSE;
   }
 
-  CopyMem (NewMd5Context, (void *)Md5Context, sizeof (MD5_CTX));
+  CopyMem (NewMd5Context, Md5Context, sizeof (MD5_CTX));
 
   return TRUE;
 }
@@ -134,14 +128,14 @@ Md5Update (
   //
   // Check invalid parameters, in case that only DataLength was checked in OpenSSL
   //
-  if (Data == NULL && (DataSize != 0)) {
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
   //
   // OpenSSL MD5 Hash Update
   //
-  return (BOOLEAN) (MD5_Update ((MD5_CTX *) Md5Context, Data, DataSize));
+  return (BOOLEAN)(MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));
 }
 
 /**
@@ -174,14 +168,14 @@ Md5Final (
   //
   // Check input parameters.
   //
-  if (Md5Context == NULL || HashValue == NULL) {
+  if ((Md5Context == NULL) || (HashValue == NULL)) {
     return FALSE;
   }
 
   //
   // OpenSSL MD5 Hash Finalization
   //
-  return (BOOLEAN) (MD5_Final (HashValue, (MD5_CTX *) Md5Context));
+  return (BOOLEAN)(MD5_Final (HashValue, (MD5_CTX *)Md5Context));
 }
 
 /**
@@ -216,7 +210,8 @@ Md5HashAll (
   if (HashValue == NULL) {
     return FALSE;
   }
-  if (Data == NULL && (DataSize != 0)) {
+
+  if ((Data == NULL) && (DataSize != 0)) {
     return FALSE;
   }
 
@@ -229,3 +224,5 @@ Md5HashAll (
     return TRUE;
   }
 }
+
+#endif