Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40983?usp=email )
Change subject: euicc: clean up superfluous encdec cpp files ......................................................................
euicc: clean up superfluous encdec cpp files
As a bonus this means in the future encdec copypaste is only required once instead of twice in two files.
Change-Id: Ice4ab4328faf6ad34a060bc2004a44de10691cff --- M eim/gen_links.sh M eim/regen_makefile.sh M ipad/gen_links.sh M ipad/regen_makefile.sh D library/euicc/PKIX1Explicit88_EncDec.cc M library/euicc/PKIX1Explicit88_Types.ttcn D library/euicc/PKIX1Implicit88_EncDec.cc M library/euicc/PKIX1Implicit88_Types.ttcn D library/euicc/RSPDefinitions_EncDec.cc M library/euicc/RSPDefinitions_Types.ttcn D library/euicc/SGP32Definitions_EncDec.cc M library/euicc/SGP32Definitions_Types.ttcn 12 files changed, 180 insertions(+), 920 deletions(-)
Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved
diff --git a/eim/gen_links.sh b/eim/gen_links.sh index c633311..a8f91dd 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -35,7 +35,6 @@ FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " -FILES+="PKIX1Explicit88_EncDec.cc PKIX1Implicit88_EncDec.cc RSPDefinitions_EncDec.cc SGP32Definitions_EncDec.cc " FILES+="es9p_Types_JSON.ttcn esx_header_Types_JSON.ttcn" gen_links $DIR $FILES
diff --git a/eim/regen_makefile.sh b/eim/regen_makefile.sh index 2b5cb24..942f849 100755 --- a/eim/regen_makefile.sh +++ b/eim/regen_makefile.sh @@ -13,10 +13,6 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc - SGP32Definitions_EncDec.cc - RSPDefinitions_EncDec.cc - PKIX1Explicit88_EncDec.cc - PKIX1Implicit88_EncDec.cc PIPEasp_PT.cc " . ../_buildsystem/regen_makefile.inc.sh diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index f47bc6e..a0b8197 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -31,7 +31,6 @@ FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " -FILES+="PKIX1Explicit88_EncDec.cc PKIX1Implicit88_EncDec.cc RSPDefinitions_EncDec.cc SGP32Definitions_EncDec.cc" gen_links $DIR $FILES
DIR=../library diff --git a/ipad/regen_makefile.sh b/ipad/regen_makefile.sh index 6aab793..021de52 100755 --- a/ipad/regen_makefile.sh +++ b/ipad/regen_makefile.sh @@ -13,10 +13,6 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc - SGP32Definitions_EncDec.cc - RSPDefinitions_EncDec.cc - PKIX1Explicit88_EncDec.cc - PKIX1Implicit88_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc " . ../_buildsystem/regen_makefile.inc.sh diff --git a/library/euicc/PKIX1Explicit88_EncDec.cc b/library/euicc/PKIX1Explicit88_EncDec.cc deleted file mode 100644 index 3cfb156..0000000 --- a/library/euicc/PKIX1Explicit88_EncDec.cc +++ /dev/null @@ -1,213 +0,0 @@ -#include "PKIX1Explicit88.hh" - -namespace PKIX1Explicit88__Types { - -using namespace PKIX1Explicit88; - -TTCN_Module PKIX1Explicit88__EncDec("PKIX1Explicit88_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__X520name(const X520name &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520name_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520name dec__X520name(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520name msg; - buf.put_os(stream); - - msg.decode(X520name_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520CommonName(const X520CommonName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520CommonName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520CommonName dec__X520CommonName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520CommonName msg; - buf.put_os(stream); - - msg.decode(X520CommonName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520LocalityName(const X520LocalityName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520LocalityName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520LocalityName dec__X520LocalityName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520LocalityName msg; - buf.put_os(stream); - - msg.decode(X520LocalityName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520StateOrProvinceName(const X520StateOrProvinceName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520StateOrProvinceName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520StateOrProvinceName dec__X520StateOrProvinceName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520StateOrProvinceName msg; - buf.put_os(stream); - - msg.decode(X520StateOrProvinceName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520OrganizationName(const X520OrganizationName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520OrganizationName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520OrganizationName dec__X520OrganizationName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520OrganizationName msg; - buf.put_os(stream); - - msg.decode(X520OrganizationName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520OrganizationalUnitName(const X520OrganizationalUnitName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520OrganizationalUnitName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520OrganizationalUnitName dec__X520OrganizationalUnitName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520OrganizationalUnitName msg; - buf.put_os(stream); - - msg.decode(X520OrganizationalUnitName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520Title(const X520Title &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520Title_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520Title dec__X520Title(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520Title msg; - buf.put_os(stream); - - msg.decode(X520Title_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520dnQualifier(const X520dnQualifier &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520dnQualifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520dnQualifier dec__X520dnQualifier(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520dnQualifier msg; - buf.put_os(stream); - - msg.decode(X520dnQualifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520countryName(const X520countryName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520countryName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520countryName dec__X520countryName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520countryName msg; - buf.put_os(stream); - - msg.decode(X520countryName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520SerialNumber(const X520SerialNumber &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520SerialNumber_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520SerialNumber dec__X520SerialNumber(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520SerialNumber msg; - buf.put_os(stream); - - msg.decode(X520SerialNumber_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520Pseudonym(const X520Pseudonym &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520Pseudonym_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520Pseudonym dec__X520Pseudonym(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520Pseudonym msg; - buf.put_os(stream); - - msg.decode(X520Pseudonym_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__Certificate(const Certificate &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(Certificate_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -Certificate dec__Certificate(const OCTETSTRING &stream) { - TTCN_Buffer buf; - Certificate msg; - buf.put_os(stream); - - msg.decode(Certificate_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/PKIX1Explicit88_Types.ttcn b/library/euicc/PKIX1Explicit88_Types.ttcn index 4f33f8c..c1c7d01 100644 --- a/library/euicc/PKIX1Explicit88_Types.ttcn +++ b/library/euicc/PKIX1Explicit88_Types.ttcn @@ -3,40 +3,64 @@ import from PKIX1Explicit88 all; import from Native_Functions all;
-external function dec_X520name(in octetstring stream) return X520name; -external function enc_X520name(in X520name msg) return octetstring; +external function dec_X520name(in octetstring stream) return X520name +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520name(in X520name msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520CommonName(in octetstring stream) return X520CommonName; -external function enc_X520CommonName(in X520CommonName msg) return octetstring; +external function dec_X520CommonName(in octetstring stream) return X520CommonName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520CommonName(in X520CommonName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520LocalityName(in octetstring stream) return X520LocalityName; -external function enc_X520LocalityName(in X520LocalityName msg) return octetstring; +external function dec_X520LocalityName(in octetstring stream) return X520LocalityName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520LocalityName(in X520LocalityName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520StateOrProvinceName(in octetstring stream) return X520StateOrProvinceName; -external function enc_X520StateOrProvinceName(in X520StateOrProvinceName msg) return octetstring; +external function dec_X520StateOrProvinceName(in octetstring stream) return X520StateOrProvinceName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520StateOrProvinceName(in X520StateOrProvinceName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520OrganizationName(in octetstring stream) return X520OrganizationName; -external function enc_X520OrganizationName(in X520OrganizationName msg) return octetstring; +external function dec_X520OrganizationName(in octetstring stream) return X520OrganizationName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520OrganizationName(in X520OrganizationName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520OrganizationalUnitName(in octetstring stream) return X520OrganizationalUnitName; -external function enc_X520OrganizationalUnitName(in X520OrganizationalUnitName msg) return octetstring; +external function dec_X520OrganizationalUnitName(in octetstring stream) return X520OrganizationalUnitName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520OrganizationalUnitName(in X520OrganizationalUnitName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520Title(in octetstring stream) return X520Title; -external function enc_X520Title(in X520Title msg) return octetstring; +external function dec_X520Title(in octetstring stream) return X520Title +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520Title(in X520Title msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520dnQualifier(in octetstring stream) return X520dnQualifier; -external function enc_X520dnQualifier(in X520dnQualifier msg) return octetstring; +external function dec_X520dnQualifier(in octetstring stream) return X520dnQualifier +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520dnQualifier(in X520dnQualifier msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520countryName(in octetstring stream) return X520countryName; -external function enc_X520countryName(in X520countryName msg) return octetstring; +external function dec_X520countryName(in octetstring stream) return X520countryName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520countryName(in X520countryName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520SerialNumber(in octetstring stream) return X520SerialNumber; -external function enc_X520SerialNumber(in X520SerialNumber msg) return octetstring; +external function dec_X520SerialNumber(in octetstring stream) return X520SerialNumber +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520SerialNumber(in X520SerialNumber msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_X520Pseudonym(in octetstring stream) return X520Pseudonym; -external function enc_X520Pseudonym(in X520Pseudonym msg) return octetstring; +external function dec_X520Pseudonym(in octetstring stream) return X520Pseudonym +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520Pseudonym(in X520Pseudonym msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_Certificate(in octetstring stream) return Certificate; -external function enc_Certificate(in Certificate msg) return octetstring; +external function dec_Certificate(in octetstring stream) return Certificate +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_Certificate(in Certificate msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
} diff --git a/library/euicc/PKIX1Implicit88_EncDec.cc b/library/euicc/PKIX1Implicit88_EncDec.cc deleted file mode 100644 index 7ce2b16..0000000 --- a/library/euicc/PKIX1Implicit88_EncDec.cc +++ /dev/null @@ -1,26 +0,0 @@ -#include "PKIX1Implicit88.hh" - -namespace PKIX1Implicit88__Types { - -using namespace PKIX1Implicit88; - -TTCN_Module PKIX1Implicit88__EncDec("PKIX1Implicit88_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__SubjectKeyIdentifier(const SubjectKeyIdentifier &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(SubjectKeyIdentifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -SubjectKeyIdentifier dec__SubjectKeyIdentifier(const OCTETSTRING &stream) { - TTCN_Buffer buf; - SubjectKeyIdentifier msg; - buf.put_os(stream); - - msg.decode(SubjectKeyIdentifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/PKIX1Implicit88_Types.ttcn b/library/euicc/PKIX1Implicit88_Types.ttcn index f816c6e..ce08199 100644 --- a/library/euicc/PKIX1Implicit88_Types.ttcn +++ b/library/euicc/PKIX1Implicit88_Types.ttcn @@ -3,7 +3,9 @@ import from PKIX1Implicit88 all; import from Native_Functions all;
-external function dec_SubjectKeyIdentifier(in octetstring stream) return SubjectKeyIdentifier; -external function enc_SubjectKeyIdentifier(in SubjectKeyIdentifier msg) return octetstring; +external function dec_SubjectKeyIdentifier(in octetstring stream) return SubjectKeyIdentifier +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_SubjectKeyIdentifier(in SubjectKeyIdentifier msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
} diff --git a/library/euicc/RSPDefinitions_EncDec.cc b/library/euicc/RSPDefinitions_EncDec.cc deleted file mode 100644 index fe4b68d..0000000 --- a/library/euicc/RSPDefinitions_EncDec.cc +++ /dev/null @@ -1,417 +0,0 @@ -#include "RSPDefinitions.hh" - -namespace RSPDefinitions__Types { - -using namespace RSPDefinitions; - -TTCN_Module RSPDefinitions__EncDec("RSPDefinitions_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__GetEuiccChallengeResponse(const GetEuiccChallengeResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEuiccChallengeResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEuiccChallengeResponse dec__GetEuiccChallengeResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEuiccChallengeResponse msg; - buf.put_os(stream); - - msg.decode(GetEuiccChallengeResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCInfo1(const EUICCInfo1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCInfo1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCInfo1 dec__EUICCInfo1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCInfo1 msg; - buf.put_os(stream); - - msg.decode(EUICCInfo1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCInfo2(const EUICCInfo2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCInfo2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCInfo2 dec__EUICCInfo2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCInfo2 msg; - buf.put_os(stream); - - msg.decode(EUICCInfo2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccSigned1(const EuiccSigned1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccSigned1 dec__EuiccSigned1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccSigned1 msg; - buf.put_os(stream); - - msg.decode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCSigned2(const EUICCSigned2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCSigned2 dec__EUICCSigned2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCSigned2 msg; - buf.put_os(stream); - - msg.decode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ControlRefTemplate(const ControlRefTemplate &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ControlRefTemplate dec__ControlRefTemplate(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ControlRefTemplate msg; - buf.put_os(stream); - - msg.decode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__AuthenticateServerResponse(const AuthenticateServerResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(AuthenticateServerResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -AuthenticateServerResponse dec__AuthenticateServerResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - AuthenticateServerResponse msg; - buf.put_os(stream); - - msg.decode(AuthenticateServerResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__CancelSessionResponse(const CancelSessionResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(CancelSessionResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -CancelSessionResponse dec__CancelSessionResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - CancelSessionResponse msg; - buf.put_os(stream); - - msg.decode(CancelSessionResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__PrepareDownloadResponse(const PrepareDownloadResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(PrepareDownloadResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -PrepareDownloadResponse dec__PrepareDownloadResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - PrepareDownloadResponse msg; - buf.put_os(stream); - - msg.decode(PrepareDownloadResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileInstallationResult(const ProfileInstallationResult &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileInstallationResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileInstallationResult dec__ProfileInstallationResult(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileInstallationResult msg; - buf.put_os(stream); - - msg.decode(ProfileInstallationResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__NotificationSentResponse(const NotificationSentResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(NotificationSentResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -NotificationSentResponse dec__NotificationSentResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - NotificationSentResponse msg; - buf.put_os(stream); - - msg.decode(NotificationSentResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RetrieveNotificationsListResponse(const RetrieveNotificationsListResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RetrieveNotificationsListResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RetrieveNotificationsListResponse dec__RetrieveNotificationsListResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RetrieveNotificationsListResponse msg; - buf.put_os(stream); - - msg.decode(RetrieveNotificationsListResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetEuiccDataResponse(const GetEuiccDataResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEuiccDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEuiccDataResponse dec__GetEuiccDataResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEuiccDataResponse msg; - buf.put_os(stream); - - msg.decode(GetEuiccDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccConfiguredAddressesResponse(const EuiccConfiguredAddressesResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccConfiguredAddressesResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccConfiguredAddressesResponse dec__EuiccConfiguredAddressesResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccConfiguredAddressesResponse msg; - buf.put_os(stream); - - msg.decode(EuiccConfiguredAddressesResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__PendingNotification(const PendingNotification &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(PendingNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -PendingNotification dec__PendingNotification(const OCTETSTRING &stream) { - TTCN_Buffer buf; - PendingNotification msg; - buf.put_os(stream); - - msg.decode(PendingNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ServerSigned1(const ServerSigned1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ServerSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ServerSigned1 dec__ServerSigned1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ServerSigned1 msg; - buf.put_os(stream); - - msg.decode(ServerSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__BoundProfilePackage(const BoundProfilePackage &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(BoundProfilePackage_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -BoundProfilePackage dec__BoundProfilePackage(const OCTETSTRING &stream) { - TTCN_Buffer buf; - BoundProfilePackage msg; - buf.put_os(stream); - - msg.decode(BoundProfilePackage_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__StoreMetadataRequest(const StoreMetadataRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(StoreMetadataRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -StoreMetadataRequest dec__StoreMetadataRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - StoreMetadataRequest msg; - buf.put_os(stream); - - msg.decode(StoreMetadataRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__SmdpSigned2(const SmdpSigned2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(SmdpSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -SmdpSigned2 dec__SmdpSigned2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - SmdpSigned2 msg; - buf.put_os(stream); - - msg.decode(SmdpSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RemoteProfileProvisioningResponse(const RemoteProfileProvisioningResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RemoteProfileProvisioningResponse dec__RemoteProfileProvisioningResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RemoteProfileProvisioningResponse msg; - buf.put_os(stream); - - msg.decode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RemoteProfileProvisioningRequest(const RemoteProfileProvisioningRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RemoteProfileProvisioningRequest dec__RemoteProfileProvisioningRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RemoteProfileProvisioningRequest msg; - buf.put_os(stream); - - msg.decode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccCancelSessionSigned(const EuiccCancelSessionSigned &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccCancelSessionSigned dec__EuiccCancelSessionSigned(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccCancelSessionSigned msg; - buf.put_os(stream); - - msg.decode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__OtherSignedNotification(const OtherSignedNotification &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -OtherSignedNotification dec__OtherSignedNotification(const OCTETSTRING &stream) { - TTCN_Buffer buf; - OtherSignedNotification msg; - buf.put_os(stream); - - msg.decode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__NotificationMetadata(const NotificationMetadata &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -NotificationMetadata dec__NotificationMetadata(const OCTETSTRING &stream) { - TTCN_Buffer buf; - NotificationMetadata msg; - buf.put_os(stream); - - msg.decode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/RSPDefinitions_Types.ttcn b/library/euicc/RSPDefinitions_Types.ttcn index 8d33f17..5a33b45 100644 --- a/library/euicc/RSPDefinitions_Types.ttcn +++ b/library/euicc/RSPDefinitions_Types.ttcn @@ -3,76 +3,124 @@ import from RSPDefinitions all; import from Native_Functions all;
-external function dec_GetEuiccChallengeResponse(in octetstring stream) return GetEuiccChallengeResponse; -external function enc_GetEuiccChallengeResponse(in GetEuiccChallengeResponse msg) return octetstring; +external function dec_GetEuiccChallengeResponse(in octetstring stream) return GetEuiccChallengeResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEuiccChallengeResponse(in GetEuiccChallengeResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EUICCInfo1(in octetstring stream) return EUICCInfo1; -external function enc_EUICCInfo1(in EUICCInfo1 msg) return octetstring; +external function dec_EUICCInfo1(in octetstring stream) return EUICCInfo1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCInfo1(in EUICCInfo1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EUICCInfo2(in octetstring stream) return EUICCInfo2; -external function enc_EUICCInfo2(in EUICCInfo2 msg) return octetstring; +external function dec_EUICCInfo2(in octetstring stream) return EUICCInfo2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCInfo2(in EUICCInfo2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_AuthenticateServerResponse(in octetstring stream) return AuthenticateServerResponse; -external function enc_AuthenticateServerResponse(in AuthenticateServerResponse msg) return octetstring; +external function dec_AuthenticateServerResponse(in octetstring stream) return AuthenticateServerResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_AuthenticateServerResponse(in AuthenticateServerResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_CancelSessionResponse(in octetstring stream) return CancelSessionResponse; -external function enc_CancelSessionResponse(in CancelSessionResponse msg) return octetstring; +external function dec_CancelSessionResponse(in octetstring stream) return CancelSessionResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_CancelSessionResponse(in CancelSessionResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_PrepareDownloadResponse(in octetstring stream) return PrepareDownloadResponse; -external function enc_PrepareDownloadResponse(in PrepareDownloadResponse msg) return octetstring; +external function dec_PrepareDownloadResponse(in octetstring stream) return PrepareDownloadResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_PrepareDownloadResponse(in PrepareDownloadResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_ProfileInstallationResult(in octetstring stream) return ProfileInstallationResult; -external function enc_ProfileInstallationResult(in ProfileInstallationResult msg) return octetstring; +external function dec_ProfileInstallationResult(in octetstring stream) return ProfileInstallationResult +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileInstallationResult(in ProfileInstallationResult msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_NotificationSentResponse(in octetstring stream) return NotificationSentResponse; -external function enc_NotificationSentResponse(in NotificationSentResponse msg) return octetstring; +external function dec_NotificationSentResponse(in octetstring stream) return NotificationSentResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_NotificationSentResponse(in NotificationSentResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_RetrieveNotificationsListResponse(in octetstring stream) return RetrieveNotificationsListResponse; -external function enc_RetrieveNotificationsListResponse(in RetrieveNotificationsListResponse msg) return octetstring; +external function dec_RetrieveNotificationsListResponse(in octetstring stream) return RetrieveNotificationsListResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RetrieveNotificationsListResponse(in RetrieveNotificationsListResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_GetEuiccDataResponse(in octetstring stream) return GetEuiccDataResponse; -external function enc_GetEuiccDataResponse(in GetEuiccDataResponse msg) return octetstring; +external function dec_GetEuiccDataResponse(in octetstring stream) return GetEuiccDataResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEuiccDataResponse(in GetEuiccDataResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EuiccConfiguredAddressesResponse(in octetstring stream) return EuiccConfiguredAddressesResponse; -external function enc_EuiccConfiguredAddressesResponse(in EuiccConfiguredAddressesResponse msg) return octetstring; +external function dec_EuiccConfiguredAddressesResponse(in octetstring stream) return EuiccConfiguredAddressesResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccConfiguredAddressesResponse(in EuiccConfiguredAddressesResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_PendingNotification(in octetstring stream) return PendingNotification; -external function enc_PendingNotification(in PendingNotification msg) return octetstring; +external function dec_PendingNotification(in octetstring stream) return PendingNotification +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_PendingNotification(in PendingNotification msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_ServerSigned1(in octetstring stream) return ServerSigned1; -external function enc_ServerSigned1(in ServerSigned1 msg) return octetstring; +external function dec_ServerSigned1(in octetstring stream) return ServerSigned1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ServerSigned1(in ServerSigned1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EuiccSigned1(in octetstring stream) return EuiccSigned1; -external function enc_EuiccSigned1(in EuiccSigned1 msg) return octetstring; +external function dec_EuiccSigned1(in octetstring stream) return EuiccSigned1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccSigned1(in EuiccSigned1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EUICCSigned2(in octetstring stream) return EUICCSigned2; -external function enc_EUICCSigned2(in EUICCSigned2 msg) return octetstring; +external function dec_EUICCSigned2(in octetstring stream) return EUICCSigned2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCSigned2(in EUICCSigned2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_ControlRefTemplate(in octetstring stream) return ControlRefTemplate; -external function enc_ControlRefTemplate(in ControlRefTemplate msg) return octetstring; +external function dec_ControlRefTemplate(in octetstring stream) return ControlRefTemplate +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ControlRefTemplate(in ControlRefTemplate msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_BoundProfilePackage(in octetstring stream) return BoundProfilePackage; -external function enc_BoundProfilePackage(in BoundProfilePackage msg) return octetstring; +external function dec_BoundProfilePackage(in octetstring stream) return BoundProfilePackage +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_BoundProfilePackage(in BoundProfilePackage msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_StoreMetadataRequest(in octetstring stream) return StoreMetadataRequest; -external function enc_StoreMetadataRequest(in StoreMetadataRequest msg) return octetstring; +external function dec_StoreMetadataRequest(in octetstring stream) return StoreMetadataRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_StoreMetadataRequest(in StoreMetadataRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2; -external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring; +external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_RemoteProfileProvisioningResponse(in octetstring stream) return RemoteProfileProvisioningResponse; -external function enc_RemoteProfileProvisioningResponse(in RemoteProfileProvisioningResponse msg) return octetstring; +external function dec_RemoteProfileProvisioningResponse(in octetstring stream) return RemoteProfileProvisioningResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RemoteProfileProvisioningResponse(in RemoteProfileProvisioningResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest; -external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring; +external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EuiccCancelSessionSigned(in octetstring stream) return EuiccCancelSessionSigned; -external function enc_EuiccCancelSessionSigned(in EuiccCancelSessionSigned msg) return octetstring; +external function dec_EuiccCancelSessionSigned(in octetstring stream) return EuiccCancelSessionSigned +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccCancelSessionSigned(in EuiccCancelSessionSigned msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_OtherSignedNotification(in octetstring stream) return OtherSignedNotification; -external function enc_OtherSignedNotification(in OtherSignedNotification msg) return octetstring; +external function dec_OtherSignedNotification(in octetstring stream) return OtherSignedNotification +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_OtherSignedNotification(in OtherSignedNotification msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_NotificationMetadata(in octetstring stream) return NotificationMetadata; -external function enc_NotificationMetadata(in NotificationMetadata msg) return octetstring; +external function dec_NotificationMetadata(in octetstring stream) return NotificationMetadata +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_NotificationMetadata(in NotificationMetadata msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
} diff --git a/library/euicc/SGP32Definitions_EncDec.cc b/library/euicc/SGP32Definitions_EncDec.cc deleted file mode 100644 index 3dbb4bf..0000000 --- a/library/euicc/SGP32Definitions_EncDec.cc +++ /dev/null @@ -1,164 +0,0 @@ -#include "SGP32Definitions.hh" - -namespace SGP32Definitions__Types { - -using namespace SGP32Definitions; -using namespace PKIX1Explicit88; - -TTCN_Module SGP32Definitions__EncDec("SGP32Definitions_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__EsipaMessageFromIpaToEim(const EsipaMessageFromIpaToEim &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EsipaMessageFromIpaToEim_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EsipaMessageFromIpaToEim dec__EsipaMessageFromIpaToEim(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EsipaMessageFromIpaToEim msg; - buf.put_os(stream); - - msg.decode(EsipaMessageFromIpaToEim_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EsipaMessageFromEimToIpa(const EsipaMessageFromEimToIpa &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EsipaMessageFromEimToIpa_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EsipaMessageFromEimToIpa dec__EsipaMessageFromEimToIpa(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EsipaMessageFromEimToIpa msg; - buf.put_os(stream); - - msg.decode(EsipaMessageFromEimToIpa_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccPackageResult(const EuiccPackageResult &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccPackageResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccPackageResult dec__EuiccPackageResult(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccPackageResult msg; - buf.put_os(stream); - - msg.decode(EuiccPackageResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetCertsResponse(const GetCertsResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetCertsResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetCertsResponse dec__GetCertsResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetCertsResponse msg; - buf.put_os(stream); - - msg.decode(GetCertsResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetEimConfigurationDataResponse(const GetEimConfigurationDataResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEimConfigurationDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEimConfigurationDataResponse dec__GetEimConfigurationDataResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEimConfigurationDataResponse msg; - buf.put_os(stream); - - msg.decode(GetEimConfigurationDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__AddInitialEimResponse(const AddInitialEimResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(AddInitialEimResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -AddInitialEimResponse dec__AddInitialEimResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - AddInitialEimResponse msg; - buf.put_os(stream); - - msg.decode(AddInitialEimResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileRollbackRequest(const ProfileRollbackRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileRollbackRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EnableUsingDDResponse dec__EnableUsingDDResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EnableUsingDDResponse msg; - buf.put_os(stream); - - msg.decode(EnableUsingDDResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EnableUsingDDResponse(const EnableUsingDDResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EnableUsingDDResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileRollbackRequest dec__ProfileRollbackRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileRollbackRequest msg; - buf.put_os(stream); - - msg.decode(ProfileRollbackRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileRollbackResponse(const ProfileRollbackResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileRollbackResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileRollbackResponse dec__ProfileRollbackResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileRollbackResponse msg; - buf.put_os(stream); - - msg.decode(ProfileRollbackResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - - -} diff --git a/library/euicc/SGP32Definitions_Types.ttcn b/library/euicc/SGP32Definitions_Types.ttcn index 492daef..9fe2b7d 100644 --- a/library/euicc/SGP32Definitions_Types.ttcn +++ b/library/euicc/SGP32Definitions_Types.ttcn @@ -3,28 +3,44 @@ import from SGP32Definitions all; import from Native_Functions all;
-external function dec_EsipaMessageFromIpaToEim(in octetstring stream) return EsipaMessageFromIpaToEim; -external function enc_EsipaMessageFromIpaToEim(in EsipaMessageFromIpaToEim msg) return octetstring; +external function dec_EsipaMessageFromIpaToEim(in octetstring stream) return EsipaMessageFromIpaToEim +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EsipaMessageFromIpaToEim(in EsipaMessageFromIpaToEim msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EsipaMessageFromEimToIpa(in octetstring stream) return EsipaMessageFromEimToIpa; -external function enc_EsipaMessageFromEimToIpa(in EsipaMessageFromEimToIpa msg) return octetstring; +external function dec_EsipaMessageFromEimToIpa(in octetstring stream) return EsipaMessageFromEimToIpa +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EsipaMessageFromEimToIpa(in EsipaMessageFromEimToIpa msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EuiccPackageResult(in octetstring stream) return EuiccPackageResult; -external function enc_EuiccPackageResult(in EuiccPackageResult msg) return octetstring; +external function dec_EuiccPackageResult(in octetstring stream) return EuiccPackageResult +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccPackageResult(in EuiccPackageResult msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_GetCertsResponse(in octetstring stream) return GetCertsResponse; -external function enc_GetCertsResponse(in GetCertsResponse msg) return octetstring; +external function dec_GetCertsResponse(in octetstring stream) return GetCertsResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetCertsResponse(in GetCertsResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_GetEimConfigurationDataResponse(in octetstring stream) return GetEimConfigurationDataResponse; -external function enc_GetEimConfigurationDataResponse(in GetEimConfigurationDataResponse msg) return octetstring; +external function dec_GetEimConfigurationDataResponse(in octetstring stream) return GetEimConfigurationDataResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEimConfigurationDataResponse(in GetEimConfigurationDataResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_EnableUsingDDResponse(in octetstring stream) return EnableUsingDDResponse; -external function enc_EnableUsingDDResponse(in EnableUsingDDResponse msg) return octetstring; +external function dec_EnableUsingDDResponse(in octetstring stream) return EnableUsingDDResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EnableUsingDDResponse(in EnableUsingDDResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_ProfileRollbackRequest(in octetstring stream) return ProfileRollbackRequest; -external function enc_ProfileRollbackRequest(in ProfileRollbackRequest msg) return octetstring; +external function dec_ProfileRollbackRequest(in octetstring stream) return ProfileRollbackRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileRollbackRequest(in ProfileRollbackRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
-external function dec_ProfileRollbackResponse(in octetstring stream) return ProfileRollbackResponse; -external function enc_ProfileRollbackResponse(in ProfileRollbackResponse msg) return octetstring; +external function dec_ProfileRollbackResponse(in octetstring stream) return ProfileRollbackResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileRollbackResponse(in ProfileRollbackResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" };
}
-
Hoernchen