From 6c43dd5259fb0b855bf13995cf324b97ead995f6 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 13 Nov 2023 15:44:15 +0000 Subject: [PATCH] Garbage collect an incoherent export crypto check Contrast "#define EVP_PKT_EXP 0x1000 /* <= 512 bit key */" with the diff: - /* /8 because it's 1024 bits we look for, not bytes */ - if (EVP_PKEY_size(pk) <= 1024 / 8) - ret |= EVP_PKT_EXP; EVP_PKT_EXP will be nuked at the next opportunity. discussed with jsing --- lib/libcrypto/x509/x509type.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libcrypto/x509/x509type.c b/lib/libcrypto/x509/x509type.c index 51bf5d501d2..7d07d2b5fed 100644 --- a/lib/libcrypto/x509/x509type.c +++ b/lib/libcrypto/x509/x509type.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509type.c,v 1.22 2023/11/13 15:40:44 tb Exp $ */ +/* $OpenBSD: x509type.c,v 1.23 2023/11/13 15:44:15 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -126,9 +126,6 @@ X509_certificate_type(const X509 *x, const EVP_PKEY *pkey) } } - /* /8 because it's 1024 bits we look for, not bytes */ - if (EVP_PKEY_size(pk) <= 1024 / 8) - ret |= EVP_PKT_EXP; return (ret); } LCRYPTO_ALIAS(X509_certificate_type); -- 2.20.1