hcrypto, otp: Remove hcrypto and otp!
We must switch to OpenSSL 3.x, and getting lib/hcrypto to provide OpenSSL 3.x APIs is too large an undertaking. Plus the hcrypto backend is not safe, not secure (probably has timing leaks galore), and no one has the resources to make it a world-class crypto library, so it just has to go.
This commit is contained in:
Nicolas Williams
+1
-2
@@ -2,7 +2,7 @@
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
SUBDIRS = kadm5 hcrypto gssapi
|
||||
SUBDIRS = kadm5 gssapi
|
||||
|
||||
noinst_PROGRAMS = bits
|
||||
CHECK_LOCAL = no-check-local
|
||||
@@ -101,7 +101,6 @@ CLEANFILES = \
|
||||
ntlm_err.h \
|
||||
ocsp_asn1.h \
|
||||
ocsp_template_asn1.h \
|
||||
otp.h \
|
||||
parse_bytes.h \
|
||||
parse_time.h \
|
||||
parse_units.h \
|
||||
|
||||
+1
-3
@@ -31,7 +31,7 @@
|
||||
|
||||
RELDIR=include
|
||||
|
||||
SUBDIRS=kadm5 hcrypto gssapi
|
||||
SUBDIRS=kadm5 gssapi
|
||||
|
||||
!include ../windows/NTMakefile.w32
|
||||
!include ../windows/NTMakefile.version
|
||||
@@ -62,12 +62,10 @@ while(<>) {
|
||||
if ("$(KRB5)") { print "#define KRB5 1\n"; }
|
||||
if ("$(KRB4)") { print "#define KRB4 1\n"; }
|
||||
if ("$(WEAK_CRYPTO)") { print "#define HEIM_WEAK_CRYPTO 1\n"; }
|
||||
if ("$(HCRYPTO_FALLBACK)") { print "#define HCRYPTO_FALLBACK 1\n"; } else { print "#define HCRYPTO_FALLBACK 0\n"; }
|
||||
if ("$(PKINIT)") { print "#define PKINIT 1\n"; }
|
||||
if ("$(NO_AFS)") { print "#define NO_AFS 1\n"; }
|
||||
if ("$(OPENLDAP)") { print "#define OPENLDAP 1\n"; }
|
||||
if ("$(OPENLDAP_MODULE)") { print "#define OPENLDAP_MODULE 1\n"; }
|
||||
if ("$(OTP)") { print "#define OTP 1 \n"; }
|
||||
if ("$(AUTHENTICATION)") { print "#define AUTHENTICATION 1\n"; }
|
||||
if ("$(DIAGNOSTICS)") { print "#define DIAGNOSTICS 1\n"; }
|
||||
if ("$(ENCRYPTION)") { print "#define ENCRYPTION 1\n"; }
|
||||
|
||||
@@ -693,9 +693,6 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
|
||||
/* Define to 1 if you have the `openpty' function. */
|
||||
/* #define HAVE_OPENPTY 1 */
|
||||
|
||||
/* define to 1 to use openssl's libcrypto as a (default) backend for libhcrypto */
|
||||
/* #undef HAVE_HCRYPTO_W_OPENSSL */
|
||||
|
||||
/* Define to enable basic OSF C2 support. */
|
||||
/* #undef HAVE_OSFC2 */
|
||||
|
||||
|
||||
+12
-12
@@ -9,17 +9,17 @@
|
||||
#include <krb5-types.h>
|
||||
#endif
|
||||
|
||||
#include <hcrypto/evp.h>
|
||||
#include <hcrypto/des.h>
|
||||
#include <hcrypto/md4.h>
|
||||
#include <hcrypto/md5.h>
|
||||
#include <hcrypto/sha.h>
|
||||
#include <hcrypto/rc4.h>
|
||||
#include <hcrypto/rc2.h>
|
||||
#include <hcrypto/ui.h>
|
||||
#include <hcrypto/rand.h>
|
||||
#include <hcrypto/engine.h>
|
||||
#include <hcrypto/pkcs12.h>
|
||||
#include <hcrypto/hmac.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <openssl/rc4.h>
|
||||
#include <openssl/rc2.h>
|
||||
#include <openssl/ui.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/engine.h>
|
||||
#include <openssl/pkcs12.h>
|
||||
#include <openssl/hmac.h>
|
||||
|
||||
#endif /* __crypto_header__ */
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
# $Id$
|
||||
|
||||
include $(top_srcdir)/Makefile.am.common
|
||||
|
||||
CLEANFILES = \
|
||||
aes.h \
|
||||
bn.h \
|
||||
des.h \
|
||||
dh.h \
|
||||
dsa.h \
|
||||
ec.h \
|
||||
ecdsa.h \
|
||||
ecdh.h \
|
||||
engine.h \
|
||||
evp.h \
|
||||
evp-hcrypto.h \
|
||||
evp-cc.h \
|
||||
hmac.h \
|
||||
md4.h \
|
||||
md5.h \
|
||||
pkcs12.h \
|
||||
rand.h \
|
||||
rc2.h \
|
||||
rc4.h \
|
||||
rsa.h \
|
||||
sha.h \
|
||||
ui.h \
|
||||
undef.h
|
||||
|
||||
EXTRA_DIST = NTMakefile
|
||||
@@ -1,34 +0,0 @@
|
||||
########################################################################
|
||||
#
|
||||
# Copyright (c) 2009, Secure Endpoints Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# - Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# - 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.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS 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
|
||||
# COPYRIGHT HOLDER OR 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.
|
||||
#
|
||||
|
||||
RELDIR=include\hcrypto
|
||||
|
||||
!include ../../windows/NTMakefile.w32
|
||||
Reference in New Issue
Block a user