diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2013-07-04 17:41:51 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-09-26 11:58:02 -0400 |
| commit | 79424b09ca1db2878cd67a59e30ff0849c058f1d (patch) | |
| tree | cf1f5b4fb58bd3b7fe654f2955f6c29e5b6e93ba /MokManager.c | |
| parent | 526ed5a231fb15f4509028072664400267840eef (diff) | |
| download | efi-boot-shim-79424b09ca1db2878cd67a59e30ff0849c058f1d.tar.gz efi-boot-shim-79424b09ca1db2878cd67a59e30ff0849c058f1d.zip | |
Merge signature.h into efiauthenticated.h and guid.h
Conflicts:
shim.c
Diffstat (limited to 'MokManager.c')
| -rw-r--r-- | MokManager.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/MokManager.c b/MokManager.c index f6bc6c28..b01c65ec 100644 --- a/MokManager.c +++ b/MokManager.c @@ -4,12 +4,13 @@ #include <openssl/x509.h> #include "console_control.h" #include "shim.h" -#include "signature.h" #include "PeImage.h" #include "PasswordCrypt.h" -#include "include/console.h" -#include "include/simple_file.h" +#include "guid.h" +#include "console.h" +#include "simple_file.h" +#include "efiauthenticated.h" #define PASSWORD_MAX 256 #define PASSWORD_MIN 1 @@ -115,8 +116,8 @@ done: static UINT32 count_keys(void *Data, UINTN DataSize) { EFI_SIGNATURE_LIST *CertList = Data; - EFI_GUID CertType = EfiCertX509Guid; - EFI_GUID HashType = EfiHashSha256Guid; + EFI_GUID CertType = X509_GUID; + EFI_GUID HashType = EFI_CERT_SHA256_GUID; UINTN dbsize = DataSize; UINT32 MokNum = 0; @@ -152,8 +153,8 @@ static MokListNode *build_mok_list(UINT32 num, void *Data, UINTN DataSize) { MokListNode *list; EFI_SIGNATURE_LIST *CertList = Data; EFI_SIGNATURE_DATA *Cert; - EFI_GUID CertType = EfiCertX509Guid; - EFI_GUID HashType = EfiHashSha256Guid; + EFI_GUID CertType = X509_GUID; + EFI_GUID HashType = EFI_CERT_SHA256_GUID; UINTN dbsize = DataSize; UINTN count = 0; @@ -1271,7 +1272,7 @@ static EFI_STATUS enroll_file (void *data, UINTN datasize, BOOLEAN hash) goto out; CertList = mokbuffer; - CertList->SignatureType = EfiHashSha256Guid; + CertList->SignatureType = EFI_CERT_SHA256_GUID; CertList->SignatureSize = 16 + SHA256_DIGEST_SIZE; CertData = (EFI_SIGNATURE_DATA *)(((UINT8 *)mokbuffer) + sizeof(EFI_SIGNATURE_LIST)); @@ -1285,7 +1286,7 @@ static EFI_STATUS enroll_file (void *data, UINTN datasize, BOOLEAN hash) goto out; CertList = mokbuffer; - CertList->SignatureType = EfiCertX509Guid; + CertList->SignatureType = X509_GUID; CertList->SignatureSize = 16 + datasize; memcpy(mokbuffer + sizeof(EFI_SIGNATURE_LIST) + 16, data, |