summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2023-11-13 15:44:15 +0000
committertb <>2023-11-13 15:44:15 +0000
commitda9360872bc2fd8e8a1a9cfeafe335fd0c356342 (patch)
treeb6d14daa9866b6f66dbddabc0acb35754ec170d5 /src
parent34491c78d388b2552abb19b71ffc01b72f2cc4e5 (diff)
downloadopenbsd-da9360872bc2fd8e8a1a9cfeafe335fd0c356342.tar.gz
openbsd-da9360872bc2fd8e8a1a9cfeafe335fd0c356342.tar.bz2
openbsd-da9360872bc2fd8e8a1a9cfeafe335fd0c356342.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509type.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509type.c b/src/lib/libcrypto/x509/x509type.c
index 51bf5d501d..7d07d2b5fe 100644
--- a/src/lib/libcrypto/x509/x509type.c
+++ b/src/lib/libcrypto/x509/x509type.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509type.c,v 1.22 2023/11/13 15:40:44 tb Exp $ */ 1/* $OpenBSD: x509type.c,v 1.23 2023/11/13 15:44:15 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -126,9 +126,6 @@ X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
126 } 126 }
127 } 127 }
128 128
129 /* /8 because it's 1024 bits we look for, not bytes */
130 if (EVP_PKEY_size(pk) <= 1024 / 8)
131 ret |= EVP_PKT_EXP;
132 return (ret); 129 return (ret);
133} 130}
134LCRYPTO_ALIAS(X509_certificate_type); 131LCRYPTO_ALIAS(X509_certificate_type);