diff options
| author | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2017-11-10 16:51:00 +0000 |
|---|---|---|
| committer | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2017-11-10 16:51:00 +0000 |
| commit | 81da1522cfc288f66d6f9c543c9b29ad334dd48a (patch) | |
| tree | 7049b6cb5acc5747490ec9a1eaa36c8599577717 | |
| parent | d3ee6bb6d8612f1d427183e680e5cfa50a1b4255 (diff) | |
"unknown KDF type 2" -> "keydisk not found".
Inputs and ok jsing@.
| -rw-r--r-- | sys/lib/libsa/softraid.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/lib/libsa/softraid.c b/sys/lib/libsa/softraid.c index 47780132bf7..84824038de7 100644 --- a/sys/lib/libsa/softraid.c +++ b/sys/lib/libsa/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.2 2016/09/18 16:34:59 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.3 2017/11/10 16:50:59 sunil Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -151,6 +151,9 @@ sr_crypto_decrypt_keys(struct sr_boot_volume *bv) } if (kd) { bcopy(&kd->kd_key, &kdfinfo.maskkey, sizeof(kdfinfo.maskkey)); + } else if (kdfhint->generic.type == SR_CRYPTOKDFT_KEYDISK) { + printf("keydisk not found\n"); + goto done; } else { if (kdfhint->generic.type != SR_CRYPTOKDFT_PKCS5_PBKDF2 && kdfhint->generic.type != SR_CRYPTOKDFT_BCRYPT_PBKDF) { |