Module Name: src
Committed By: mlelstv
Date: Sun Dec 30 12:05:48 UTC 2018
Modified Files:
src/sbin/cgdconfig: params.c
Log Message:
Avoid crash when no algorithm is specified in parameter file.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sbin/cgdconfig/params.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/params.c
diff -u src/sbin/cgdconfig/params.c:1.29 src/sbin/cgdconfig/params.c:1.30
--- src/sbin/cgdconfig/params.c:1.29 Sun Dec 11 00:34:39 2016
+++ src/sbin/cgdconfig/params.c Sun Dec 30 12:05:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.29 2016/12/11 00:34:39 alnsn Exp $ */
+/* $NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: params.c,v 1.29 2016/12/11 00:34:39 alnsn Exp $");
+__RCSID("$NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $");
#endif
#include <sys/types.h>
@@ -158,6 +158,8 @@ params_filldefaults(struct params *p)
if (!p->ivmeth)
p->ivmeth = string_fromcharstar("encblkno1");
if (p->keylen == (size_t)-1) {
+ if (p->algorithm == NULL)
+ return -1;
i = crypt_defaults_lookup(string_tocharstar(p->algorithm));
if (i != (size_t)-1) {
p->keylen = crypto_defaults[i].keylen;
