From d3d350a0fc971911a52ca4bce39520f4dc8920b4 Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 20 Dec 2023 06:28:04 +0000 Subject: [PATCH] DES_random_key() sets the key There's no need to have 60 lines of license for 4 lines of actual code. Move DES_random_key() to set_key.c. --- lib/libcrypto/Makefile | 3 +- lib/libcrypto/des/rand_key.c | 68 ------------------------------------ lib/libcrypto/des/set_key.c | 15 +++++++- 3 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 lib/libcrypto/des/rand_key.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 2a793f8aee8..d97358900dd 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.156 2023/11/12 10:49:27 robert Exp $ +# $OpenBSD: Makefile,v 1.157 2023/12/20 06:28:04 tb Exp $ LIB= crypto LIBREBUILD=y @@ -284,7 +284,6 @@ SRCS+= ofb64enc.c SRCS+= ofb_enc.c SRCS+= pcbc_enc.c SRCS+= qud_cksm.c -SRCS+= rand_key.c SRCS+= set_key.c SRCS+= str2key.c SRCS+= xcbc_enc.c diff --git a/lib/libcrypto/des/rand_key.c b/lib/libcrypto/des/rand_key.c deleted file mode 100644 index aba899fe0ab..00000000000 --- a/lib/libcrypto/des/rand_key.c +++ /dev/null @@ -1,68 +0,0 @@ -/* $OpenBSD: rand_key.c,v 1.9 2023/07/08 07:11:07 beck Exp $ */ -/* ==================================================================== - * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#include - -#include - -int -DES_random_key(DES_cblock *ret) -{ - do { - arc4random_buf(ret, sizeof(DES_cblock)); - DES_set_odd_parity(ret); - } while (DES_is_weak_key(ret)); - return (1); -} diff --git a/lib/libcrypto/des/set_key.c b/lib/libcrypto/des/set_key.c index c1fd02846f3..d1b6fa6e8d6 100644 --- a/lib/libcrypto/des/set_key.c +++ b/lib/libcrypto/des/set_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set_key.c,v 1.24 2023/12/20 06:22:27 tb Exp $ */ +/* $OpenBSD: set_key.c,v 1.25 2023/12/20 06:28:04 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,7 +63,10 @@ * 1.1 added norm_expand_bits * 1.0 First working version */ +#include + #include + #include "des_local.h" int DES_check_key = 0; /* defaults to false */ @@ -398,3 +401,13 @@ DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule) { return (DES_set_key(key, schedule)); } + +int +DES_random_key(DES_cblock *ret) +{ + do { + arc4random_buf(ret, sizeof(DES_cblock)); + DES_set_odd_parity(ret); + } while (DES_is_weak_key(ret)); + return (1); +} -- 2.20.1