MokManager: support Tradition DES hash

This commit is contained in:
Gary Ching-Pang Lin 2013-01-29 17:10:10 +08:00 committed by Peter Jones
parent 09f6afbe72
commit be9108a8b9
2 changed files with 24 additions and 6 deletions

View File

@ -3,18 +3,21 @@
#include <Library/BaseCryptLib.h> #include <Library/BaseCryptLib.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/des.h>
#include "PasswordCrypt.h" #include "PasswordCrypt.h"
#include "crypt_blowfish.h" #include "crypt_blowfish.h"
#define TRAD_DES_HASH_SIZE 13 /* (64/6+1) + (12/6) */
#define BSDI_DES_HASH_SIZE 20 /* (64/6+1) + (24/6) + 4 + 1 */
#define BLOWFISH_HASH_SIZE 31 /* 184/6+1 */ #define BLOWFISH_HASH_SIZE 31 /* 184/6+1 */
UINT16 get_hash_size (const UINT16 method) UINT16 get_hash_size (const UINT16 method)
{ {
switch (method) { switch (method) {
case TRANDITIONAL_DES: case TRADITIONAL_DES:
return 64 / 8; /* per "man crypt" */ return TRAD_DES_HASH_SIZE;
case EXTEND_BSDI_DES: case EXTEND_BSDI_DES:
return 64 / 8; /* per "man crypt" */ return BSDI_DES_HASH_SIZE;
case MD5_BASED: case MD5_BASED:
return MD5_DIGEST_LENGTH; return MD5_DIGEST_LENGTH;
case SHA256_BASED: case SHA256_BASED:
@ -28,6 +31,20 @@ UINT16 get_hash_size (const UINT16 method)
return 0; return 0;
} }
static EFI_STATUS trad_des_crypt (const char *key, const char *salt, UINT8 *hash)
{
char result[TRAD_DES_HASH_SIZE + 1];
char *ret;
ret = DES_fcrypt(key, salt, result);
if (ret) {
CopyMem(hash, result, TRAD_DES_HASH_SIZE);
return EFI_SUCCESS;
}
return EFI_UNSUPPORTED;
}
static const char md5_salt_prefix[] = "$1$"; static const char md5_salt_prefix[] = "$1$";
static EFI_STATUS md5_crypt (const char *key, UINT32 key_len, static EFI_STATUS md5_crypt (const char *key, UINT32 key_len,
@ -290,9 +307,10 @@ EFI_STATUS password_crypt (const char *password, UINT32 pw_length,
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
switch (pw_crypt->method) { switch (pw_crypt->method) {
case TRANDITIONAL_DES: case TRADITIONAL_DES:
status = trad_des_crypt (password, (char *)pw_crypt->salt, hash);
break;
case EXTEND_BSDI_DES: case EXTEND_BSDI_DES:
/* TODO unsupported */
status = EFI_UNSUPPORTED; status = EFI_UNSUPPORTED;
break; break;
case MD5_BASED: case MD5_BASED:

View File

@ -2,7 +2,7 @@
#define __PASSWORD_CRYPT_H__ #define __PASSWORD_CRYPT_H__
enum HashMethod { enum HashMethod {
TRANDITIONAL_DES = 0, TRADITIONAL_DES = 0,
EXTEND_BSDI_DES, EXTEND_BSDI_DES,
MD5_BASED, MD5_BASED,
SHA256_BASED, SHA256_BASED,