diff options
| author | Steve McIntyre <steve@einval.com> | 2022-04-27 22:41:59 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2022-04-27 22:41:59 +0100 |
| commit | 8529e0f7f70f427a7202815061362eceba6bfc50 (patch) | |
| tree | 5ca094ab3c464c6ce9f7046d59aff69cec571f4a /Cryptlib | |
| parent | 8119f7183f5f0bebb168fec5239855552020cf66 (diff) | |
| download | efi-boot-shim-8529e0f7f70f427a7202815061362eceba6bfc50.tar.gz efi-boot-shim-8529e0f7f70f427a7202815061362eceba6bfc50.zip | |
New upstream version 15.5upstream/15.5
Diffstat (limited to 'Cryptlib')
| -rw-r--r-- | Cryptlib/Hash/CryptMd5.c | 2 | ||||
| -rw-r--r-- | Cryptlib/Hash/CryptSha1.c | 2 | ||||
| -rw-r--r-- | Cryptlib/Hash/CryptSha256.c | 2 | ||||
| -rw-r--r-- | Cryptlib/Hash/CryptSha512.c | 4 | ||||
| -rw-r--r-- | Cryptlib/Include/OpenSslSupport.h | 4 | ||||
| -rw-r--r-- | Cryptlib/Pk/CryptPkcs7Verify.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Cryptlib/Hash/CryptMd5.c b/Cryptlib/Hash/CryptMd5.c index ccf6ad00..b389f0e1 100644 --- a/Cryptlib/Hash/CryptMd5.c +++ b/Cryptlib/Hash/CryptMd5.c @@ -93,7 +93,7 @@ Md5Duplicate ( return FALSE;
}
- CopyMem (NewMd5Context, Md5Context, sizeof (MD5_CTX));
+ CopyMem (NewMd5Context, (void *)Md5Context, sizeof (MD5_CTX));
return TRUE;
}
diff --git a/Cryptlib/Hash/CryptSha1.c b/Cryptlib/Hash/CryptSha1.c index 42cfd08a..3e67a805 100644 --- a/Cryptlib/Hash/CryptSha1.c +++ b/Cryptlib/Hash/CryptSha1.c @@ -92,7 +92,7 @@ Sha1Duplicate ( return FALSE;
}
- CopyMem (NewSha1Context, Sha1Context, sizeof (SHA_CTX));
+ CopyMem (NewSha1Context, (void *)Sha1Context, sizeof (SHA_CTX));
return TRUE;
}
diff --git a/Cryptlib/Hash/CryptSha256.c b/Cryptlib/Hash/CryptSha256.c index 06ecb2e9..05bc6b0a 100644 --- a/Cryptlib/Hash/CryptSha256.c +++ b/Cryptlib/Hash/CryptSha256.c @@ -91,7 +91,7 @@ Sha256Duplicate ( return FALSE;
}
- CopyMem (NewSha256Context, Sha256Context, sizeof (SHA256_CTX));
+ CopyMem (NewSha256Context, (void *)Sha256Context, sizeof (SHA256_CTX));
return TRUE;
}
diff --git a/Cryptlib/Hash/CryptSha512.c b/Cryptlib/Hash/CryptSha512.c index 3ce372a0..16063b23 100644 --- a/Cryptlib/Hash/CryptSha512.c +++ b/Cryptlib/Hash/CryptSha512.c @@ -93,7 +93,7 @@ Sha384Duplicate ( return FALSE;
}
- CopyMem (NewSha384Context, Sha384Context, sizeof (SHA512_CTX));
+ CopyMem (NewSha384Context, (void *)Sha384Context, sizeof (SHA512_CTX));
return TRUE;
}
@@ -308,7 +308,7 @@ Sha512Duplicate ( return FALSE;
}
- CopyMem (NewSha512Context, Sha512Context, sizeof (SHA512_CTX));
+ CopyMem (NewSha512Context, (void *)Sha512Context, sizeof (SHA512_CTX));
return TRUE;
}
diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h index b97149e2..0c2fb8b0 100644 --- a/Cryptlib/Include/OpenSslSupport.h +++ b/Cryptlib/Include/OpenSslSupport.h @@ -262,11 +262,11 @@ extern FILE *stdout; //
// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
//
-#define memcpy(dest,source,count) ( {CopyMem(dest,source,(UINTN)(count)); dest; })
+#define memcpy(dest,source,count) ( {CopyMem(dest,(void *)source,(UINTN)(count)); dest; })
#define memset(dest,ch,count) SetMem(dest,(UINTN)(count),(UINT8)(ch))
#define memchr(buf,ch,count) ScanMem8((CHAR8 *)buf,(UINTN)(count),ch)
#define memcmp(buf1,buf2,count) (int)(CompareMem(buf1,buf2,(UINTN)(count)))
-#define memmove(dest,source,count) CopyMem(dest,source,(UINTN)(count))
+#define memmove(dest,source,count) CopyMem(dest,(void *)source,(UINTN)(count))
#define localtime(timer) NULL
#define assert(expression)
#define atoi(nptr) AsciiStrDecimalToUintn((const CHAR8 *)nptr)
diff --git a/Cryptlib/Pk/CryptPkcs7Verify.c b/Cryptlib/Pk/CryptPkcs7Verify.c index 09895d8c..c1893848 100644 --- a/Cryptlib/Pk/CryptPkcs7Verify.c +++ b/Cryptlib/Pk/CryptPkcs7Verify.c @@ -216,7 +216,7 @@ WrapPkcs7Data ( //
// Part7: P7Data.
//
- CopyMem (SignedData + 19, P7Data, P7Length);
+ CopyMem (SignedData + 19, (void *)P7Data, P7Length);
}
*WrapFlag = Wrapped;
|