From 61f6b7ea985357ce6af5e309654a147eeb4a2f88 Mon Sep 17 00:00:00 2001
From: Zhi Guan <guan@pku.edu.cn>
Date: Sun, 7 Jan 2018 12:02:24 +0800
Subject: [PATCH] Some warning fixes.

---
 crypto/saf/saf_lcl.h | 1 +
 test/cpktest.c       | 4 ----
 test/otptest.c       | 2 --
 test/serpenttest.c   | 1 +
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/crypto/saf/saf_lcl.h b/crypto/saf/saf_lcl.h
index d29f5837..da2c5594 100644
--- a/crypto/saf/saf_lcl.h
+++ b/crypto/saf/saf_lcl.h
@@ -52,6 +52,7 @@
 #include <openssl/gmsdf.h>
 #include <openssl/gmsaf.h>
 #include <openssl/engine.h>
+#include <openssl/err.h>
 
 typedef struct saf_app_st {
 	ENGINE *engine;
diff --git a/test/cpktest.c b/test/cpktest.c
index 71b5db7c..8350cc75 100644
--- a/test/cpktest.c
+++ b/test/cpktest.c
@@ -105,10 +105,6 @@ int main(int argc, char **argv)
 
 	return 0;
 
-	/* init openssl global functions */
-	ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
-
 	/* prepare cpk setup parameters */
 	if (!(ec_key = EC_KEY_new_by_curve_name(OBJ_sn2nid("prime192v1")))) {
 		goto end;
diff --git a/test/otptest.c b/test/otptest.c
index 28165153..13468f49 100644
--- a/test/otptest.c
+++ b/test/otptest.c
@@ -77,8 +77,6 @@ int main(int argc, char **argv)
 	params.option_size = 0;
 	params.otp_digits = 6;
 
-	OpenSSL_add_all_algorithms();
-
 	if (!OTP_generate(&params, event, sizeof(event), &otp, key, sizeof(key))) {
 		printf("OTP_generate() failed\n");
 		return -1;
diff --git a/test/serpenttest.c b/test/serpenttest.c
index df237804..6ae8ddad 100755
--- a/test/serpenttest.c
+++ b/test/serpenttest.c
@@ -70,6 +70,7 @@ int main(int argc, char **argv)
 }
 #else
 
+#include <ctype.h>
 #include <openssl/serpent.h>
 
 char *plain[] =