From: Alexander Traud <pabstraud@compuserve.com>
Date: Fri, 8 Jun 2018 09:03:35 +0000 (+0200)
Subject: res_crypto: Allow OpenSSL configured with no-deprecated.
X-Git-Tag: 15.5.0-rc1~39^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=016070fd3a9e4671266e5c1eb48b32cdfdee2387;p=thirdparty%2Fasterisk.git

res_crypto: Allow OpenSSL configured with no-deprecated.

The header <openssl/rsa.h> had to be included explicitly.

ASTERISK-27906

Change-Id: I41743801eed998c039d73db7a0762d104a4f75b2
---

diff --git a/res/res_crypto.c b/res/res_crypto.c
index 8f97ce9f8b..46003bcc03 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -33,21 +33,28 @@
 
 #include "asterisk.h"
 
-#include "asterisk/paths.h"	/* use ast_config_AST_KEY_DIR */
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/aes.h>
-#include <dirent.h>
-
-#include "asterisk/module.h"
-#include "asterisk/md5.h"
-#include "asterisk/cli.h"
-#include "asterisk/io.h"
-#include "asterisk/lock.h"
-#include "asterisk/utils.h"
+#include <dirent.h>                 /* for closedir, opendir, readdir, DIR */
+
+#include <openssl/aes.h>            /* for AES_decrypt, AES_encrypt, AES_set... */
+#include <openssl/err.h>            /* for ERR_print_errors_fp */
+#include <openssl/ssl.h>            /* for NID_sha1, RSA */
+#include <openssl/pem.h>            /* for PEM_read_RSAPrivateKey, PEM_read_... */
+#include <openssl/rsa.h>            /* for RSA_free, RSA_private_decrypt, RSA */
+#include <openssl/sha.h>            /* for SHA1 */
+
+#include "asterisk/cli.h"           /* for ast_cli, ast_cli_args, ast_cli_entry */
+#include "asterisk/compat.h"        /* for strcasecmp */
+#include "asterisk/io.h"            /* for ast_hide_password, ast_restore_tty */
+#include "asterisk/linkedlists.h"   /* for AST_RWLIST_TRAVERSE, AST_RWLIST_U... */
+#include "asterisk/logger.h"        /* for ast_log, LOG_WARNING, LOG_NOTICE */
+#include "asterisk/md5.h"           /* for MD5Final, MD5Init, MD5Update, MD5... */
+#include "asterisk/module.h"        /* for ast_module_flags::AST_MODFLAG_GLO... */
+#include "asterisk/options.h"       /* for ast_opt_init_keys */
+#include "asterisk/paths.h"         /* for ast_config_AST_KEY_DIR */
+#include "asterisk/utils.h"         /* for ast_copy_string, ast_base64decode */
 
 #define AST_API_MODULE
-#include "asterisk/crypto.h"
+#include "asterisk/crypto.h"        /* for AST_KEY_PUBLIC, AST_KEY_PRIVATE */
 
 /*
  * Asterisk uses RSA keys with SHA-1 message digests for its