From 81da1522cfc288f66d6f9c543c9b29ad334dd48a Mon Sep 17 00:00:00 2001 From: Sunil Nimmagadda Date: Fri, 10 Nov 2017 16:51:00 +0000 Subject: "unknown KDF type 2" -> "keydisk not found". Inputs and ok jsing@. --- sys/lib/libsa/softraid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 @@ -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) { -- cgit v1.2.3