Migrate over to using pyosmocom

We're creating a 'pyosmocom' pypi module which contains a number of core
Osmocom libraries / interfaces that are not specific to SIM card stuff
contained here.

The main modules moved in this initial step are pySim.tlv, pySim.utils
and pySim.construct. utils is split, not all of the contents is
unrelated to SIM Cards.  The other two are moved completely.

Change-Id: I4b63e45bcb0c9ba2424dacf85e0222aee735f411

pySim/esim/bsp.py

@@ -35,7 +35,8 @@ from cryptography.hazmat.primitives.kdf.x963kdf import X963KDF
 from Cryptodome.Cipher import AES
 from Cryptodome.Hash import CMAC
 
-from pySim.utils import bertlv_encode_len, bertlv_parse_one, b2h
+from osmocom.utils import b2h
+from osmocom.tlv import bertlv_encode_len, bertlv_parse_one
 
 # don't log by default
 logger = logging.getLogger(__name__)

pySim/esim/es8p.py

@@ -17,11 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from typing import Dict, List, Optional
-
 from cryptography.hazmat.primitives.asymmetric import ec
-
-from pySim.utils import b2h, h2b, bertlv_encode_tag, bertlv_encode_len, bertlv_parse_one_rawtag
-from pySim.utils import bertlv_return_one_rawtlv
+from osmocom.utils import b2h, h2b
+from osmocom.tlv import bertlv_encode_tag, bertlv_encode_len, bertlv_parse_one_rawtag
+from osmocom.tlv import bertlv_return_one_rawtlv
 
 import pySim.esim.rsp as rsp
 from pySim.esim.bsp import BspInstance

pySim/esim/rsp.py

@@ -23,8 +23,9 @@ import shelve
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.serialization import Encoding
 from cryptography import x509
+from osmocom.utils import b2h
+from osmocom.tlv import bertlv_parse_one_rawtag, bertlv_return_one_rawtlv
 
-from pySim.utils import bertlv_parse_one_rawtag, bertlv_return_one_rawtlv, b2h
 from pySim.esim import compile_asn1_subdir
 
 asn1 = compile_asn1_subdir('rsp')

pySim/esim/saip/__init__.py

@@ -20,19 +20,19 @@ import abc
 import io
 from typing import Tuple, List, Optional, Dict, Union
 from collections import OrderedDict
-
 import asn1tools
+from osmocom.utils import b2h, h2b, Hexstr
+from osmocom.tlv import BER_TLV_IE, bertlv_parse_tag, bertlv_parse_len
+from osmocom.construct import build_construct, parse_construct, GreedyInteger
 
-from pySim.utils import bertlv_parse_tag, bertlv_parse_len, b2h, h2b, dec_imsi, Hexstr
+from pySim.utils import dec_imsi
 from pySim.ts_102_221 import FileDescriptor
 from pySim.filesystem import CardADF, Path
 from pySim.ts_31_102 import ADF_USIM
 from pySim.ts_31_103 import ADF_ISIM
-from pySim.construct import build_construct, parse_construct, GreedyInteger
 from pySim.esim import compile_asn1_subdir
 from pySim.esim.saip import templates
 from pySim.esim.saip import oid
-from pySim.tlv import BER_TLV_IE
 from pySim.global_platform import KeyType, KeyUsageQualifier
 from pySim.global_platform.uicc import UiccSdInstallParams
 

pySim/esim/saip/personalization.py

@@ -19,7 +19,7 @@ import abc
 import io
 from typing import List, Tuple
 
-from pySim.tlv import camel_to_snake
+from osmocom.tlv import camel_to_snake
 from pySim.utils import enc_iccid, enc_imsi, h2b, rpad, sanitize_iccid
 from pySim.esim.saip import ProfileElement, ProfileElementSequence