@@ -1,9 +1,7 @@

-CRYPTOPP_NAME=cryptopp

-

-CXXFLAGS += -fPIC -fno-stack-protector -std=c++11  -g -DCRYPTOPP_NAME=$(CRYPTOPP_NAME)

+CXXFLAGS += -fPIC -fno-stack-protector -std=c++11  -g

 CFLAGS += -fPIC -fno-stack-protector -g

-#LDFLAGS = -Wl,-Bstatic -l$(CRYPTOPP_NAME) -Wl,-Bdynamic -lpam -Wl,--as-needed

-LDFLAGS = -lpam -l$(CRYPTOPP_NAME) @LIBS@

+#LDFLAGS = -Wl,-Bstatic -Wl,-Bdynamic -lpam -Wl,--as-needed

+LDFLAGS = -lpam @LIBS@

 INTEGRATION_OBJS = sys_syslog.o sys_fstream.o sys_unistd.o sys_pwd.o sys_pam.o \

                    sys_stdlib.o sys_time.o

@@ -44,7 +42,7 @@ distclean: clean

 .depend: $(OBJS:.o=.cc) $(TEST_SOURCES)

 	rm -f ./.depend

-	$(CXX) -std=c++11 -MM -DCRYPTOPP_NAME=$(CRYPTOPP_NAME) $^ > ./.depend;

+	$(CXX) -std=c++11 -MM $^ > ./.depend;

 -include .depend

@@ -677,7 +677,6 @@ ac_subst_files=''

 ac_user_opts='

 enable_option_checking

 with_pam_module_directory

-with_cryptopp

 '

       ac_precious_vars='build_alias

 host_alias

@@ -1299,7 +1298,6 @@ Optional Packages:

   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

   --with-pam-module-directory=NAME

         Use NAME as installation directory for PAM modules

-  --with-cryptopp         Build algorithms that need Crypto++ support

 Some influential environment variables:

   CC          C compiler command

@@ -2842,16 +2840,6 @@ fi

-#check whether to build with crypto++

-

-# Check whether --with-cryptopp was given.

-if test "${with_cryptopp+set}" = set; then :

-  withval=$with_cryptopp; WITH_CRYPTOPP=$withval

-else

-  WITH_CRYPTOPP=yes

-fi

-

-

 ac_ext=c

 ac_cpp='$CPP $CPPFLAGS'

@@ -26,12 +26,6 @@ AC_ARG_WITH(pam-module-directory,

     PAM_MODULE_DIRECTORY="$DEFAULT_PAM_MODULE_DIRECTORY")

 AC_SUBST(PAM_MODULE_DIRECTORY)

-#check whether to build with crypto++

-AC_ARG_WITH([cryptopp],

-	AC_HELP_STRING([--with-cryptopp],[Build algorithms that need Crypto++ support]),

-	[WITH_CRYPTOPP=$withval],

-	[WITH_CRYPTOPP=yes])

-

 AC_CHECK_HEADERS([openssl/hmac.h openssl/evp.h],,[AC_MSG_ERROR("Can't find Openssl")])

 AC_CHECK_LIB([ssl], [SSL_library_init],,[AC_MSG_ERROR("Can't find -lssl")])

 AC_CHECK_LIB([crypto], [EVP_EncryptInit],,[AC_MSG_ERROR("Can't find -lcrypto")])

@@ -19,11 +19,6 @@

 #include <cmath>

 #include <ctime>

-#include <cryptopp/base32.h>

-#include <cryptopp/hex.h>

-#include <cryptopp/hmac.h>

-#include <cryptopp/osrng.h>

-

 #include "sys_stdlib.h"

 #include "sys_time.h"