From 0efcf371b4a61fa1376e83d2b7404aeb47a36e26 Mon Sep 17 00:00:00 2001 From: Super User Date: Thu, 1 May 2008 10:35:20 +0200 Subject: work on chan_lcr modified: Makefile modified: action.cpp modified: action_efi.cpp modified: action_vbox.cpp modified: apppbx.cpp modified: apppbx.h modified: bchannel.c modified: bchannel.h new file: callerid.c new file: callerid.h modified: chan_lcr.c modified: chan_lcr.h modified: crypt.cpp modified: endpoint.cpp modified: endpointapp.cpp modified: interface.c modified: join.cpp modified: joinpbx.cpp modified: joinremote.cpp modified: mISDN.cpp modified: mail.c modified: main.h modified: message.h modified: port.cpp modified: route.c modified: route.h modified: socket_server.c modified: todo.txt modified: vbox.cpp modified: watch.c --- crypt.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'crypt.cpp') diff --git a/crypt.cpp b/crypt.cpp index 92f0c10..80ece0e 100644 --- a/crypt.cpp +++ b/crypt.cpp @@ -140,14 +140,10 @@ the message type is encoded as element */ -#include -#include -#include -#include +#include "main.h" #ifdef CRYPTO #include #endif -#include "main.h" /* convert key string to binary key vector @@ -1831,7 +1827,7 @@ void EndpointAppPBX::encrypt_shared(void) errstr = "No Remote ID"; goto reject; } - ret = parse_secrets((char *)e_ext.number, (char *)numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype), &auth_pointer, &crypt_pointer, &key_pointer); + ret = parse_secrets((char *)e_ext.number, (char *)numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international), &auth_pointer, &crypt_pointer, &key_pointer); } if (!ret) { -- cgit v1.2.3-55-g7522