Skip to content

Commit 6c9872f

Browse files
committed
upstream: remove ability to enable DSA support. Actual code will be
g/c'd separately. ok deraadt@ OpenBSD-Commit-ID: 2a032b75156c4d922e8343fa97ff6bc227f09819
1 parent 8460aaa commit 6c9872f

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

configure.ac

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,16 +2179,6 @@ AC_ARG_WITH([security-key-standalone],
21792179
[ enable_sk_standalone=$withval ]
21802180
)
21812181

2182-
enable_dsa=
2183-
AC_ARG_ENABLE([dsa-keys],
2184-
[ --enable-dsa-keys enable DSA key support [no]],
2185-
[
2186-
if test "x$enableval" != "xno" ; then
2187-
enable_dsa=1
2188-
fi
2189-
]
2190-
)
2191-
21922182
AC_SEARCH_LIBS([dlopen], [dl])
21932183
AC_CHECK_FUNCS([dlopen])
21942184
AC_CHECK_DECL([RTLD_NOW], [], [], [#include <dlfcn.h>])
@@ -3297,26 +3287,6 @@ if test "x$openssl" = "xyes" ; then
32973287
AC_MSG_RESULT([no])
32983288
]
32993289
)
3300-
3301-
openssl_dsa=no
3302-
if test ! -z "$enable_dsa" ; then
3303-
AC_CHECK_DECLS([OPENSSL_NO_DSA], [], [
3304-
AC_CHECK_DECLS([OPENSSL_IS_BORINGSSL], [],
3305-
[ openssl_dsa=yes ],
3306-
[ #include <openssl/opensslconf.h> ]
3307-
)
3308-
],
3309-
[ #include <openssl/opensslconf.h> ]
3310-
)
3311-
AC_MSG_CHECKING([whether to enable DSA key support])
3312-
if test "x$openssl_dsa" = "xno"; then
3313-
AC_MSG_ERROR([DSA requested but not supported by OpenSSL])
3314-
else
3315-
AC_MSG_RESULT([yes])
3316-
AC_DEFINE([WITH_DSA], [1],
3317-
[DSA keys explicitly enabled])
3318-
fi
3319-
fi
33203290
fi
33213291

33223292
# PKCS11/U2F depend on OpenSSL and dlopen().

0 commit comments

Comments
 (0)