sippy 2.3.0__tar.gz → 2.4.1__tar.gz

{sippy-2.3.0 → sippy-2.4.1}/MANIFEST.in

@@ -2,3 +2,4 @@ include README.md
 include requirements.txt
 include sippy/dictionary
 recursive-include sippy/UI/static *
+recursive-include sippy/UI/templates *

{sippy-2.3.0/sippy.egg-info → sippy-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sippy
-Version: 2.3.0
+Version: 2.4.1
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.
@@ -17,6 +17,8 @@ Requires-Dist: rtpsynth>=1.3.0
 Requires-Dist: g722>=1.2.3
 Requires-Dist: pycryptodome
 Requires-Dist: websockets
+Requires-Dist: flask
+Requires-Dist: flask-login
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{sippy-2.3.0 → sippy-2.4.1}/requirements.txt

@@ -3,3 +3,5 @@ rtpsynth>=1.3.0
 g722>=1.2.3
 pycryptodome
 websockets
+flask
+flask-login

{sippy-2.3.0 → sippy-2.4.1}/setup.py

@@ -12,7 +12,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name = "sippy",
-    version = "2.3.0",
+    version = "2.4.1",
     packages = find_packages(),
 
     install_requires = requirements,

{sippy-2.3.0 → sippy-2.4.1}/sippy/B2B/Route.py

@@ -40,32 +40,69 @@ DST_SIP_UA = 'sip-ua'
 DST_WSS_UA = 'wss-ua'
 
 class B2BRoute(object):
+    crt_set = False
+    params = None
+    extra_headers = None
     rnum = None
+    _ui_cats = {'auth': 'Outbound Digest Authentication', 'net': 'Network', 'lim': 'Limits',
+                      'num': 'Calling / Called Numbers', 'acct': 'Accounting'}
+    _ui_hints = {}
+#    _ui_hints['rnum'] = {'hidden': True}
     addrinfo = None
-    cld = None
-    cld_set = False
-    hostport = None
-    hostonly = None
-    credit_time = None
-    crt_set = False
-    expires = None
-    no_progress_expires = None
-    no_reply_expires = None
-    forward_on_fail = False
-    user = None
-    passw = None
+#    _ui_hints['addrinfo'] = {'readonly': True, 'category': _ui_cats['net'], 'hidden': True}
+    hostonly:str = None
+#    _ui_hints['hostonly'] = {'readonly': True, 'category': _ui_cats['net'], 'hidden': True}
+    ainfo = None
+#    _ui_hints['ainfo'] = {'readonly': True, 'category': _ui_cats['net'], 'hidden': True}
+    hostport:str = None
+    _ui_hints['hostport'] = {'name': 'Destination', 'description': 'Destination host:port',
+                                'category': _ui_cats['net']}
+    user:str = None
+    _ui_hints['user'] = {'name': 'SIP Username', 'category': _ui_cats['auth'],
+                'active': lambda o: not o.pass_auth}
+    passw:str = None
+    _ui_hints['passw'] = {'name': 'SIP Password', 'category': _ui_cats['auth'], 'password': True,
+                 'active': lambda o: not o.pass_auth}
     pass_auth = True
-    cli = None
+    _ui_hints['pass_auth'] = {'name': 'Mode', 'category': _ui_cats['auth'],
+                     'values': {False: 'Normal ("UAC")', True: 'Pass-through ("Proxy")'},}
+    _cld:str = None
+    _ui_hints['cld'] = {'name': 'Called Party (CLD)', 'description': 'Called party number',
+               'category': _ui_cats['num'], 'type': str}
+    cld_set = False
+    _ui_hints['cld_set'] = {'name': 'CLD Mode', 'description': 'Controls outbound CLD',
+                   'category': _ui_cats['num'], 'active': lambda o: not o.cld,
+                   'values': lambda o: {True: 'Erase', False: 'Pass-through'}
+                               if not o.cld else {True: 'Replace'}}
+    _cli:str = None
+    _ui_hints['cli'] = {'name': 'Calling Party (CLI)', 'description': 'Caller number',
+               'category': _ui_cats['num'], 'type': str}
     cli_set = False
-    params = None
-    ainfo = None
-    extra_headers = None
+    _ui_hints['cli_set'] = {'name': 'CLI Mode', 'description': 'Controls outbound CLI', 'category':
+                   _ui_cats['num'], 'active': lambda o: not o.cli,
+                   'values': lambda o: {True: 'Erase', False: 'Pass-through'}
+                               if not o.cli else {True: 'Replace'}}
+    credit_time:float = None
+    _ui_hints['credit_time'] = {'name': 'Credit Time', 'description': 'Allowed call duration, in seconds',
+                                   'category': _ui_cats['lim']}
+    expires:float = None
+    _ui_hints['expires'] = {'name': 'Route Expiry', 'description': 'Time to expire the route, in seconds',
+                               'category': _ui_cats['lim']}
+    no_progress_expires:float = None
+    _ui_hints['no_progress_expires'] = {'name': 'No Progress Timeout', 'category': _ui_cats['lim'],
+      'description': 'Time to expire the route if no 180 or 183 provisional response received, in seconds'}
+    no_reply_expires:float = None
+    _ui_hints['no_reply_expires'] = {'name': 'No Reply Timeout', 'category': _ui_cats['lim'],
+      'description': 'Time to expire the route if no provisional response received, in seconds'}
+    forward_on_fail = False
+    _ui_hints['forward_on_fail'] = {'name': 'Failed Calls', 'category': _ui_cats['acct'],
+                           'description': 'Emit accounting on SIP failures'}
 
     def __init__(self, sroute = None, cself = None):
         if cself != None:
             self.rnum = cself.rnum
             self.addrinfo = cself.addrinfo
-            self.cld = cself.cld
+            self._cld = cself.cld
             self.cld_set = cself.cld_set
             self.hostport = cself.hostport
             self.hostonly = cself.hostonly
@@ -78,7 +115,7 @@ class B2BRoute(object):
             self.user = cself.user
             self.passw = cself.passw
             self.pass_auth = cself.pass_auth
-            self.cli = cself.cli
+            self._cli = cself.cli
             self.cli_set = cself.cli_set
             self.params = dict(cself.params)
             self.ainfo = cself.ainfo
@@ -93,7 +130,6 @@ class B2BRoute(object):
                 # as opposed to the Routing:host, which means that CLD should be obtained
                 # from the incoming call leg.
                 self.cld = None
-            self.cld_set = True
         else:
             self.hostport = route[0]
         if not self.hostport.startswith('['):
@@ -147,7 +183,6 @@ class B2BRoute(object):
                 self.cli = v
                 if len(self.cli) == 0:
                     self.cli = None
-                self.cli_set = True
             elif a == 'cnam':
                 caller_name = unquote(v)
                 if len(caller_name) == 0:
@@ -175,9 +210,9 @@ class B2BRoute(object):
       pass_headers, max_credit_time):
         self.rnum = rnum
         if not self.cld_set:
-            self.cld = default_cld
+            self._cld = default_cld
         if not self.cli_set:
-            self.cli = default_cli
+            self._cli = default_cli
         if not self.crt_set:
             self.crt_set = default_credit_time
         if 'gt' in self.params:
@@ -210,3 +245,21 @@ class B2BRoute(object):
         if af == AF_INET6:
             return ((('[%s]' % amatch[0], amatch[1]), same_af))
         return (((amatch[0], amatch[1]), same_af))
+
+    @property
+    def cli(self):
+        return self._cli
+
+    @cli.setter
+    def cli(self, value):
+        self._cli = value
+        self.cli_set = True
+
+    @property
+    def cld(self):
+        return self._cld
+
+    @cld.setter
+    def cld(self, value):
+        self._cld = value
+        self.cld_set = True

{sippy-2.3.0 → sippy-2.4.1}/sippy/B2B/SimpleAPI.py

@@ -116,10 +116,11 @@ class B2BSimpleAPI(CLIConnectionManager):
             clim.send('OK\n')
             return False
         if cmd == 'r':
-            if len(args) != 1:
-                clim.send('ERROR: syntax error: r [<id>]\n')
+            if len(args) not in (1, 2):
+                clim.send('ERROR: syntax error: r <id> [<media-index>]\n')
                 return False
             idx = int(args[0])
+            media_index = int(args[1]) if len(args) == 2 else 0
             dlist = [x for x in ccm.ccmap if x.id == idx]
             if len(dlist) == 0:
                 clim.send('ERROR: no call with id of %d has been found\n' % idx)
@@ -128,9 +129,12 @@ class B2BSimpleAPI(CLIConnectionManager):
                 if not cc.proxied:
                     continue
                 if cc.state == CCStateConnected:
-                    cc.disconnect(MonoTime().getOffsetCopy(-60), origin = 'media_timeout')
+                    cc.disconnect(MonoTime().getOffsetCopy(-60), origin = 'media_timeout',
+                      media_index = media_index)
                     continue
                 if cc.state == CCStateARComplete:
+                    if cc.rtp_proxy_session is not None:
+                        cc.rtp_proxy_session.media_timeout_index = media_index
                     cc.uaO.disconnect(MonoTime().getOffsetCopy(-60), origin = 'media_timeout')
                     continue
             clim.send('OK\n')

{sippy-2.3.0 → sippy-2.4.1}/sippy/MyConfigParser.py

@@ -104,9 +104,13 @@ SUPPORTED_OPTIONS = { \
                              '"host:port:cert_file:key_file", where "cert_file" ' \
                              '/ "key_file" are paths to the TLS certificate ' \
                              'and key file respectively in the X.509 PEM format'),
- 'pre_auth_proc': ('S', 'internal routine to be executed before authentication '\
-                        'is being processed. E.g. "HDR2Xattrs[X-foo-hdr]."'), \
- 'xmpp_b2bua_id':     ('I', 'ID passed to the XMPP socket server')}
+ 'pre_auth_proc':     ('S', 'internal routine to be executed before authentication '\
+                             'is being processed. E.g. "HDR2Xattrs[X-foo-hdr]."'), \
+ 'xmpp_b2bua_id':     ('I', 'ID passed to the XMPP socket server'), \
+ 'ui':                ('B', 'enable Web management UI'), \
+ 'uiparams':          ('S', 'Semicolon-separated list of UI parameters corresponding to ' \
+                             'the flask\'s run() routine'), \
+}
 
 class MyConfigParser(RawConfigParser):
     _default_section = None

{sippy-2.3.0 → sippy-2.4.1}/sippy/Rtp/EPoint.py

@@ -2,6 +2,7 @@ from typing import Optional, Tuple
 from uuid import uuid4, UUID
 from threading import Lock
 import errno
+import weakref
 
 from rtpsynth.RtpServer import RtpQueueFullError, RtpServer
 from sippy.Time.MonoTime import MonoTime
@@ -14,9 +15,12 @@ from .Singletons import acquire_rtp_server, release_rtp_server
 
 class RTPEPoint():
     debug: bool = False
+    rtp_received_lock_timeout = 0.01
     id: UUID
     dl_file = None
     firstframe = True
+    writer = None
+    rserv = None
     rtp_params:RTPParams
     state_lock: Lock
     handlers: RTPHandlers
@@ -29,7 +33,6 @@ class RTPEPoint():
         self._palloc = rc.palloc
         self._rtp_server = None
         self.state_lock = Lock()
-        self.writer = None
         self.rsess = self.make_rtp_instream(rtp_params, audio_in)
         rserv_opts = self.make_udp_server_opts(rtp_params)
         self.rserv = self.make_udp_server(rserv_opts)
@@ -46,6 +49,28 @@ class RTPEPoint():
         palloc = self._palloc if rtp_params.rtp_lport == 0 else rtp_params.rtp_lport
         return (rtp_params.rtp_laddr, palloc)
 
+    def _make_rtp_received_cb(self):
+        self_ref = weakref.ref(self)
+
+        def rtp_received_cb(data, address, rtime_ns=None):
+            self = self_ref()
+            if self is None:
+                return
+            return self.rtp_received(data, address, rtime_ns)
+
+        return rtp_received_cb
+
+    def _make_send_pkt_cb(self):
+        self_ref = weakref.ref(self)
+
+        def send_pkt_cb(pkt):
+            self = self_ref()
+            if self is None:
+                return
+            return self.send_pkt(pkt)
+
+        return send_pkt_cb
+
     def make_udp_server(self, rserv_opts):
         rtp_laddr, palloc = rserv_opts
         server_cls = self.handlers.rtp_server_cls
@@ -67,7 +92,7 @@ class RTPEPoint():
 
     def _create_channel(self, rtp_server:RtpServer, bind_host:str, bind_port:int):
         bind_family = self.rtp_params.rtp_family
-        ch_kwargs = dict(pkt_in=self.rtp_received, bind_host=bind_host, bind_port=bind_port)
+        ch_kwargs = dict(pkt_in=self._make_rtp_received_cb(), bind_host=bind_host, bind_port=bind_port)
         ch = rtp_server.create_channel(bind_family=bind_family, **ch_kwargs)
         self.rtp_params.rtp_lport = bind_port
         return ch
@@ -113,7 +138,7 @@ class RTPEPoint():
     def writer_setup(self):
         assert self.writer is None
         writer = self.make_writer(self.rtp_params)
-        writer.set_pkt_send_f(self.send_pkt)
+        writer.set_pkt_send_f(self._make_send_pkt_cb())
         if self.dl_file is not None:
             writer.enable_datalog(self.dl_file)
         writer.start()
@@ -134,12 +159,18 @@ class RTPEPoint():
             rtime = MonoTime().monot
         else:
             rtime = rtime_ns / 1_000_000_000.0
-        with self.state_lock:
+        if not self.state_lock.acquire(timeout=self.rtp_received_lock_timeout):
+            if self.debug:
+                print(f'RTP.EPoint.rtp_received[{str(self.id)[:6]}]: state lock timeout')
+            return
+        try:
             target = self.rtp_params.rtp_target
             if target is not None and address != target:
                 if self.debug:
                     print(f"InfernRTPIngest.rtp_received: address mismatch {address=} {self.rtp_params.rtp_target=}")
                 return
+        finally:
+            self.state_lock.release()
         self.rsess.rtp_received(data, address, rtime)
 
     def update(self, rtp_params:RTPParams):
@@ -176,7 +207,7 @@ class RTPEPoint():
             channel.set_target(target[0], target[1])
         if need_new_writer:
             new_writer = self.make_writer(rtp_params)
-            new_writer.set_pkt_send_f(self.send_pkt)
+            new_writer.set_pkt_send_f(self._make_send_pkt_cb())
             if self.dl_file is not None:
                 new_writer.enable_datalog(self.dl_file)
             new_writer.start()
@@ -195,12 +226,10 @@ class RTPEPoint():
     def shutdown(self):
         with self.state_lock:
             writer, channel, rtp_server = self.writer, self.rserv, self._rtp_server
-            self.writer, self._rtp_server = (None, None)
+            self.writer, self.rserv, self._rtp_server = (None, None, None)
         if writer is not None:
             writer.end()
             writer.join()
-        with self.state_lock:
-            self.rserv = None
         if channel is not None:
             channel.close()
         if rtp_server is not None:
@@ -209,6 +238,7 @@ class RTPEPoint():
     def __del__(self):
         if self.debug:
             print('RTP.EPoint.__del__')
+        self.shutdown()
 
     def soundout(self, chunk:AudioChunk):
         if self.firstframe:

{sippy-2.3.0 → sippy-2.4.1}/sippy/Rtp_proxy/Client/udp.py

@@ -34,9 +34,7 @@ from sippy.Rtp_proxy.cmd import Rtp_proxy_cmd
 from sippy.Rtp_proxy.Client.net import Rtp_proxy_client_net
 
 from socket import SOCK_DGRAM, AF_INET
-from time import time
-from hashlib import md5
-from random import random
+from secrets import token_hex
 
 def getnretrans(first_rert, timeout):
     if first_rert <= 0:
@@ -93,8 +91,7 @@ class Rtp_proxy_client_udp(Rtp_proxy_client_net):
         self.delay_flt = recfilter(0.95, 0.25)
 
     def send_command(self, command, result_callback = None, *callback_parameters):
-        entropy = str(random()) + str(time())
-        cookie = md5(entropy.encode()).hexdigest()
+        cookie = token_hex(16)
         next_retr = self.delay_flt.lastval * 4.0
         exp_time = 3.0
         if isinstance(command, Rtp_proxy_cmd):

{sippy-2.3.0 → sippy-2.4.1}/sippy/Rtp_proxy/Session/side.py

@@ -90,9 +90,8 @@ class _rtpps_side(object):
             command += ' %s %s %d %s %s' % ('%s-%d' % (up.rtpps.call_id, up.index), up.remote_ip, up.remote_port, from_tag, to_tag)
         else:
             command += ' %s %s %d %s' % ('%s-%d' % (up.rtpps.call_id, up.index), up.remote_ip, up.remote_port, from_tag)
-        if up.rtpps.notify_socket != None and up.index == 0 and \
-          rtpc.tnot_supported:
-            command += ' %s %s' % (up.rtpps.notify_socket, up.rtpps.notify_tag)
+        if up.rtpps.notify_socket is not None and up.rtpps.notify_tag is not None and rtpc.tnot_supported:
+            command += ' %s %s' % (up.rtpps.notify_socket, up.rtpps.get_notify_tag(up.index))
         if len(up.subcommands) > 0:
             command = ' && '.join([command,] + [sc for subc in up.subcommands for sc in subc.commands])
         rtpq.send_command(command, self.update_result, up)

{sippy-2.3.0 → sippy-2.4.1}/sippy/Rtp_proxy/session.py

@@ -25,9 +25,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from functools import partial
-from hashlib import md5
 from random import random
-from time import time
+from secrets import token_hex
+try:
+    from urllib import quote, unquote
+except ImportError:
+    from urllib.parse import quote, unquote
 try:
     from _thread import get_ident
 except ImportError:
@@ -52,6 +55,7 @@ class Rtp_proxy_session(object):
     max_index = -1
     notify_socket = None
     notify_tag = None
+    media_timeout_index = None
     global_config = None
     my_ident = None
     insert_nortpp = False
@@ -74,20 +78,18 @@ class Rtp_proxy_session(object):
         if call_id != None:
             self.call_id = call_id
         else:
-            salt = str(random()) + str(time())
-            self.call_id = md5(salt.encode()).hexdigest()
+            self.call_id = token_hex(16)
         if from_tag != None:
             self.from_tag = from_tag
         else:
-            salt = str(random()) + str(time())
-            self.from_tag = md5(salt.encode()).hexdigest()
+            self.from_tag = token_hex(16)
         if to_tag != None:
             self.to_tag = to_tag
         else:
-            salt = str(random()) + str(time())
-            self.to_tag = md5(salt.encode()).hexdigest()
+            self.to_tag = token_hex(16)
         self.notify_socket = self.rtp_proxy_client.notify_socket
         self.notify_tag = notify_tag
+        self.media_timeout_index = None
         self.caller = _rtpps_side('caller')
         self.callee = _rtpps_side('callee')
 
@@ -147,12 +149,18 @@ class Rtp_proxy_session(object):
         command = make_command('o')
         return self.rtpp_seq.send_command(command, result_callback)
 
+    def get_notify_tag(self, index):
+        if index == 0:
+            return self.notify_tag
+        return quote('%s %d' % (unquote(self.notify_tag), index))
+
     def delete(self):
         if self.rtp_proxy_client == None:
             return
         while self.max_index >= 0:
-            command = 'D %s %s %s' % ('%s-%d' % (self.call_id, self.max_index), self.from_tag, self.to_tag)
-            self.rtpp_seq.send_command(command)
+            if self.media_timeout_index is None or self.max_index != self.media_timeout_index:
+                command = 'D %s %s %s' % ('%s-%d' % (self.call_id, self.max_index), self.from_tag, self.to_tag)
+                self.rtpp_seq.send_command(command)
             self.max_index -= 1
         self.rtp_proxy_client = None
         self.rtpp_seq.delete()

{sippy-2.3.0 → sippy-2.4.1}/sippy/Security/SipNonce.py

@@ -27,12 +27,16 @@
 
 from functools import partial
 from base64 import b64encode, b64decode
+from hmac import compare_digest, new as hmac_new
+from secrets import token_bytes
 
-from Crypto import Random
 from Crypto.Cipher import AES
 
 from sippy.Time.clock_dtime import clock_getntime, CLOCK_MONOTONIC
 
+AES_BLOCK_SIZE = AES.block_size
+MAC_SIZE = 16
+
 to_bytes_be = partial(int.to_bytes, byteorder='big')
 from_bytes_be = partial(int.from_bytes, byteorder='big')
 
@@ -43,23 +47,30 @@ def bxor(ba1, ba2):
     return to_bytes_be(ba1 ^ ba2, olen)
 
 class AESCipher(object):
-    bpad = '='.encode()
     cipher = None
+    mac_key = None
 
     def __init__(self, key):
-        self.cipher = AES.new(key, AES.MODE_ECB)
+        self.cipher = AES.new(key[:AES_BLOCK_SIZE * 2], AES.MODE_ECB)
+        self.mac_key = key[AES_BLOCK_SIZE * 2:]
 
     def encrypt(self, raw):
-        iv = Random.new().read(AES.block_size)
+        iv = token_bytes(AES_BLOCK_SIZE)
         raw = bxor(raw, iv)
         eraw = self.cipher.encrypt(iv + raw)
-        return b64encode(eraw)[:-1]
+        eraw += hmac_new(self.mac_key, eraw, 'sha256').digest()[:MAC_SIZE]
+        return b64encode(eraw).rstrip(b'=')
 
     def decrypt(self, enc):
-        enc = b64decode(enc + self.bpad)
-        raw = self.cipher.decrypt(enc)
-        iv = raw[:AES.block_size]
-        return bxor(raw[AES.block_size:], iv)
+        enc = b64decode(enc + (b'=' * (-len(enc) % 4)))
+        data = enc[:-MAC_SIZE]
+        tag = enc[-MAC_SIZE:]
+        ctag = hmac_new(self.mac_key, data, 'sha256').digest()[:MAC_SIZE]
+        if not compare_digest(ctag, tag):
+            raise ValueError
+        raw = self.cipher.decrypt(data)
+        iv = raw[:AES_BLOCK_SIZE]
+        return bxor(raw[AES_BLOCK_SIZE:], iv)
 
 DGST_MD5        = (1 << 0)
 DGST_MD5SESS    = (1 << 1)
@@ -72,7 +83,7 @@ DGST_PRIOS = (DGST_SHA512, DGST_SHA512SESS, DGST_SHA256, DGST_SHA256SESS, DGST_M
 
 class HashOracle(object):
     try: key # pylint: disable=used-before-assignment
-    except: key = Random.new().read(AES.block_size * 2)
+    except: key = token_bytes(AES_BLOCK_SIZE * 4)
     ac = None
     vtime = 32 * 10**9
 
@@ -83,13 +94,16 @@ class HashOracle(object):
         ts128 = clock_getntime(CLOCK_MONOTONIC) << len(DGST_PRIOS)
         for ms in cmask:
             ts128 |= ms
-        cryptic = self.ac.encrypt(to_bytes_be(ts128, AES.block_size))
+        cryptic = self.ac.encrypt(to_bytes_be(ts128, AES_BLOCK_SIZE))
         #return cryptic
         return cryptic.decode()
 
     def validate_challenge(self, cryptic, cmask):
         new_ts = clock_getntime(CLOCK_MONOTONIC)
-        decryptic = from_bytes_be(self.ac.decrypt(cryptic.encode()))
+        try:
+            decryptic = from_bytes_be(self.ac.decrypt(cryptic.encode()))
+        except ValueError:
+            return False
         for ms in cmask:
             if (ms & decryptic) == 0:
                 return False

{sippy-2.3.0 → sippy-2.4.1}/sippy/SipAuthorization.py

@@ -28,24 +28,11 @@ from sippy.SipGenericHF import SipGenericHF
 from sippy.Security.SipNonce import HashOracle, DGST_MD5, DGST_MD5SESS, \
   DGST_SHA256, DGST_SHA256SESS, DGST_SHA512, DGST_SHA512SESS
 
-from hashlib import md5, sha256
+from hashlib import md5, new as hash_new, sha256
 
-from Crypto.Hash import SHA512
 
-class sha512_256(object):
-    d = None
-
-    def __init__(self):
-        self.d = SHA512.new(truncate = '256')
-
-    def update(self, arg):
-        self.d.update(arg)
-
-    def digest(self):
-        return self.d.digest()
-
-    def hexdigest(self):
-        return self.d.hexdigest()
+def sha512_256():
+    return hash_new('sha512_256')
 
 _HASH_FUNC = {None:(md5, DGST_MD5), 'MD5':(md5, DGST_MD5), 'MD5-sess':(md5, DGST_MD5SESS), \
   'SHA-256':(sha256, DGST_SHA256), 'SHA-256-sess':(sha256, DGST_SHA256SESS), \

{sippy-2.3.0 → sippy-2.4.1}/sippy/SipCallId.py

@@ -25,9 +25,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from random import random
-from hashlib import md5
-from time import time
 from math import floor
+from secrets import token_hex
 from sippy.SipConf import SipConf
 from sippy.SipGenericHF import SipGenericHF
 
@@ -58,8 +57,7 @@ class SipCallId(SipGenericHF):
         return SipCallId(self.body + str(other))
 
     def genCallId(self):
-        salt = str((random() * 1000000000) + time())
-        self.body = md5(salt.encode()).hexdigest()
+        self.body = token_hex(16)
 
     def getCanName(self, name, compact = False):
         if compact:

{sippy-2.3.0 → sippy-2.4.1}/sippy/SipCiscoGUID.py

@@ -24,9 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from random import random
-from hashlib import md5
-from time import time
+from secrets import token_bytes
 from sippy.SipGenericHF import SipGenericHF
 
 class SipCiscoGUID(SipGenericHF):
@@ -41,9 +39,8 @@ class SipCiscoGUID(SipGenericHF):
         if ciscoGUID != None:
             self.ciscoGUID = ciscoGUID
         else:
-            salt = str((random() * 1000000000) + time())
-            s = md5(salt.encode()).hexdigest()
-            self.ciscoGUID = (int(s[0:8], 16), int(s[8:16], 16), int(s[16:24], 16), int(s[24:32], 16))
+            s = token_bytes(16)
+            self.ciscoGUID = tuple(int.from_bytes(s[i:i + 4], 'big') for i in range(0, 16, 4))
 
     def parse(self):
         self.ciscoGUID = tuple([int(x) for x in  self.body.split('-', 3)])

{sippy-2.3.0 → sippy-2.4.1}/sippy/SipFrom.py

@@ -25,9 +25,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from random import random
-from hashlib import md5
-from time import time
 from math import floor
+from secrets import token_hex
 from sippy.SipAddressHF import SipAddressHF
 from sippy.SipAddress import SipAddress
 from sippy.SipURL import SipURL
@@ -57,8 +56,7 @@ class SipFrom(SipAddressHF):
         return self.address.getParam('tag')
 
     def genTag(self):
-        salt = str((random() * 1000000000) + time())
-        self.address.setParam('tag', md5(salt.encode()).hexdigest())
+        self.address.setParam('tag', token_hex(16))
 
     def setTag(self, value):
         self.address.setParam('tag', value)

{sippy-2.3.0 → sippy-2.4.1}/sippy/SipVia.py

@@ -25,8 +25,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from random import random
-from hashlib import md5
-from time import time
+from secrets import token_hex
 from sippy.SipGenericHF import SipGenericHF
 from sippy.SipConf import SipConf
 from sippy.ESipHeaderCSV import ESipHeaderCSV
@@ -131,8 +130,7 @@ class SipVia(SipGenericHF):
         return SipVia(cself=self)
 
     def genBranch(self):
-        salt = str((random() * 1000000000) + time())
-        self.params['branch'] = 'z9hG4bK' + md5(salt.encode()).hexdigest()
+        self.params['branch'] = 'z9hG4bK' + token_hex(16)
 
     def getBranch(self):
         return self.params.get('branch', None)