laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/37618?usp=email )

Change subject: pySim.esim.saip: Add OID comparison functions ......................................................................

pySim.esim.saip: Add OID comparison functions

Change-Id: Iab642e0cc6597f667ea126827ea888652f0f2689 --- M pySim/esim/saip/oid.py M tests/test_esim_saip.py 2 files changed, 54 insertions(+), 0 deletions(-)

Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/pySim/esim/saip/oid.py b/pySim/esim/saip/oid.py index 91a48c1..6828e81 100644 --- a/pySim/esim/saip/oid.py +++ b/pySim/esim/saip/oid.py @@ -15,8 +15,10 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see http://www.gnu.org/licenses/.

+from functools import total_ordering from typing import List, Union

+@total_ordering class OID: @staticmethod def intlist_from_str(instr: str) -> List[int]: @@ -26,6 +28,10 @@ def str_from_intlist(intlist: List[int]) -> str: return '.'.join([str(x) for x in intlist])

+ @staticmethod + def highest_oid(oids: List['OID']) -> 'OID': + return sorted(oids)[-1] + def __init__(self, initializer: Union[List[int], str]): if isinstance(initializer, str): self.intlist = self.intlist_from_str(initializer) @@ -38,6 +44,39 @@ def __repr__(self) -> str: return 'OID(%s)' % (str(self))

+ def __eq__(self, other: 'OID'): + return (self.intlist == other.intlist) + + def __ne__(self, other: 'OID'): + # implement based on __eq__ + return not (self == other) + + def cmp(self, other: 'OID'): + self_len = len(self.intlist) + other_len = len(other.intlist) + common_len = min(self_len, other_len) + max_len = max(self_len, other_len) + + for i in range(0, max_len+1): + if i >= self_len: + # other list is longer + return -1 + if i >= other_len: + # our list is longer + return 1 + if self.intlist[i] > other.intlist[i]: + # our version is higher + return 1 + if self.intlist[i] < other.intlist[i]: + # other version is higher + return -1 + # continue to next digit + return 0 + + def __gt__(self, other: 'OID'): + if self.cmp(other) > 0: + return True + def prefix_match(self, oid_str): """determine if oid_str is equal or below our OID.""" return oid_str.startswith(str(self)) diff --git a/tests/test_esim_saip.py b/tests/test_esim_saip.py index 82ed692..dcde1b4 100755 --- a/tests/test_esim_saip.py +++ b/tests/test_esim_saip.py @@ -83,6 +83,12 @@ pes.append(inst) pes.to_der()

+class OidTest(unittest.TestCase): + def test_cmp(self): + self.assertTrue(oid.OID('1.0') > oid.OID('0.9')) + self.assertTrue(oid.OID('1.0') == oid.OID('1.0')) + self.assertTrue(oid.OID('1.0.1') > oid.OID('1.0')) + self.assertTrue(oid.OID('1.0.2') > oid.OID('1.0.1'))

if __name__ == "__main__": unittest.main()