diff options
-rwxr-xr-x | include/asterisk/utils.h | 4 | ||||
-rwxr-xr-x | res/Makefile | 6 | ||||
-rwxr-xr-x | utils.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 992bccde0..cd2098d94 100755 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -142,8 +142,8 @@ extern struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *h \brief Produces MD5 hash based on input string */ extern void ast_md5_hash(char *output, char *input); -extern int ast_base64encode(char *dst, unsigned char *src, int srclen, int max); -extern int ast_base64decode(unsigned char *dst, char *src, int max); +extern int ast_base64encode(char *dst, const unsigned char *src, int srclen, int max); +extern int ast_base64decode(unsigned char *dst, const char *src, int max); /*! ast_uri_encode \brief Turn text string to URI-encoded %XX version diff --git a/res/Makefile b/res/Makefile index 4386f05db..47e0c4f9b 100755 --- a/res/Makefile +++ b/res/Makefile @@ -11,7 +11,7 @@ # the GNU General Public License # -MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \ +MODS=res_adsi.so res_features.so res_musiconhold.so res_indications.so res_monitor.so \ res_agi.so ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) @@ -23,6 +23,10 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CR MODS+=res_odbc.so endif +ifneq ($(NOCRYPTO),yes) + MODS+=res_crypto.so +endif + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) MODS+=res_osp.so OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a @@ -278,7 +278,7 @@ void ast_md5_hash(char *output, char *input) ptr += sprintf(ptr, "%2.2x", digest[x]); } -int ast_base64decode(unsigned char *dst, char *src, int max) +int ast_base64decode(unsigned char *dst, const char *src, int max) { int cnt = 0; unsigned int byte = 0; @@ -316,7 +316,7 @@ int ast_base64decode(unsigned char *dst, char *src, int max) return cnt; } -int ast_base64encode(char *dst, unsigned char *src, int srclen, int max) +int ast_base64encode(char *dst, const unsigned char *src, int srclen, int max) { int cnt = 0; unsigned int byte = 0; |