check in the generated ASN.1 beans

This will facilitate inclusion of OpenEUICC in AOSP source tree

libs/lpad-sm-dp-plus-connector/build.gradle

@@ -15,11 +15,11 @@ dependencies {
     testImplementation 'com.github.tomakehurst:wiremock:2.17.0'
 }
 
-sourceSets.main.java.srcDirs = ['build/generated-sources/asn1','src/main/java']
+sourceSets.main.java.srcDirs = ['src/generated/asn1','src/main/java']
 
 task genAsn1(type: JavaExec) {
     mainClass = 'com.beanit.asn1bean.compiler.Compiler'
-    args "-o", "$projectDir/build/generated-sources/asn1", "-p", "com.truphone.rsp.dto.asn1", "-f", "$projectDir/src/main/resources/PKIXExplicit88.asn", "$projectDir/src/main/resources/PKIXImplicit88.asn", "$projectDir/src/main/resources/rsp.asn"
+    args "-o", "$projectDir/src/generated/asn1", "-p", "com.truphone.rsp.dto.asn1", "-f", "$projectDir/src/main/resources/PKIXExplicit88.asn", "$projectDir/src/main/resources/PKIXImplicit88.asn", "$projectDir/src/main/resources/rsp.asn"
     classpath configurations.tool
 }
 

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/AdministrationDomainName.java

@@ -0,0 +1,153 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class AdministrationDomainName implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private byte[] code = null;
+	public static final BerTag tag = new BerTag(BerTag.APPLICATION_CLASS, BerTag.CONSTRUCTED, 2);
+
+	private BerNumericString numeric = null;
+	private BerPrintableString printable = null;
+	
+	public AdministrationDomainName() {
+	}
+
+	public AdministrationDomainName(byte[] code) {
+		this.code = code;
+	}
+
+	public void setNumeric(BerNumericString numeric) {
+		this.numeric = numeric;
+	}
+
+	public BerNumericString getNumeric() {
+		return numeric;
+	}
+
+	public void setPrintable(BerPrintableString printable) {
+		this.printable = printable;
+	}
+
+	public BerPrintableString getPrintable() {
+		return printable;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		if (printable != null) {
+			codeLength += printable.encode(reverseOS, true);
+			codeLength += BerLength.encodeLength(reverseOS, codeLength);
+			if (withTag) {
+				codeLength += tag.encode(reverseOS);
+			}
+			return codeLength;
+		}
+		
+		if (numeric != null) {
+			codeLength += numeric.encode(reverseOS, true);
+			codeLength += BerLength.encodeLength(reverseOS, codeLength);
+			if (withTag) {
+				codeLength += tag.encode(reverseOS);
+			}
+			return codeLength;
+		}
+		
+		throw new IOException("Error encoding CHOICE: No element of CHOICE was selected.");
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlvByteCount = 0;
+		BerTag berTag = new BerTag();
+
+		if (withTag) {
+			tlvByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength explicitTagLength = new BerLength();
+		tlvByteCount += explicitTagLength.decode(is);
+		tlvByteCount += berTag.decode(is);
+
+		if (berTag.equals(BerNumericString.tag)) {
+			numeric = new BerNumericString();
+			tlvByteCount += numeric.decode(is, false);
+			tlvByteCount += explicitTagLength.readEocIfIndefinite(is);
+			return tlvByteCount;
+		}
+
+		if (berTag.equals(BerPrintableString.tag)) {
+			printable = new BerPrintableString();
+			tlvByteCount += printable.decode(is, false);
+			tlvByteCount += explicitTagLength.readEocIfIndefinite(is);
+			return tlvByteCount;
+		}
+
+		throw new IOException("Error decoding CHOICE: Tag " + berTag + " matched to no item.");
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		if (numeric != null) {
+			sb.append("numeric: ").append(numeric);
+			return;
+		}
+
+		if (printable != null) {
+			sb.append("printable: ").append(printable);
+			return;
+		}
+
+		sb.append("<none>");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/AlgorithmIdentifier.java

@@ -0,0 +1,184 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class AlgorithmIdentifier implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+
+	private byte[] code = null;
+	private BerObjectIdentifier algorithm = null;
+	private BerAny parameters = null;
+	
+	public AlgorithmIdentifier() {
+	}
+
+	public AlgorithmIdentifier(byte[] code) {
+		this.code = code;
+	}
+
+	public void setAlgorithm(BerObjectIdentifier algorithm) {
+		this.algorithm = algorithm;
+	}
+
+	public BerObjectIdentifier getAlgorithm() {
+		return algorithm;
+	}
+
+	public void setParameters(BerAny parameters) {
+		this.parameters = parameters;
+	}
+
+	public BerAny getParameters() {
+		return parameters;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		if (parameters != null) {
+			codeLength += parameters.encode(reverseOS);
+		}
+		
+		codeLength += algorithm.encode(reverseOS, true);
+		
+		codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+		if (withTag) {
+			codeLength += tag.encode(reverseOS);
+		}
+
+		return codeLength;
+
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlByteCount = 0;
+		int vByteCount = 0;
+		int numDecodedBytes;
+		BerTag berTag = new BerTag();
+
+		if (withTag) {
+			tlByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength length = new BerLength();
+		tlByteCount += length.decode(is);
+		int lengthVal = length.val;
+		vByteCount += berTag.decode(is);
+
+		if (berTag.equals(BerObjectIdentifier.tag)) {
+			algorithm = new BerObjectIdentifier();
+			vByteCount += algorithm.decode(is, false);
+			if (lengthVal >= 0 && vByteCount == lengthVal) {
+				return tlByteCount + vByteCount;
+			}
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		parameters = new BerAny();
+		numDecodedBytes = parameters.decode(is, berTag);
+		if (numDecodedBytes != 0) {
+			vByteCount += numDecodedBytes;
+			if (lengthVal >= 0 && vByteCount == lengthVal) {
+				return tlByteCount + vByteCount;
+			}
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			parameters = null;
+		}
+		if (lengthVal < 0) {
+			if (!berTag.equals(0, 0, 0)) {
+				throw new IOException("Decoded sequence has wrong end of contents octets");
+			}
+			vByteCount += BerLength.readEocByte(is);
+			return tlByteCount + vByteCount;
+		}
+
+		throw new IOException("Unexpected end of sequence, length tag: " + lengthVal + ", bytes decoded: " + vByteCount);
+
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		sb.append("{");
+		sb.append("\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (algorithm != null) {
+			sb.append("algorithm: ").append(algorithm);
+		}
+		else {
+			sb.append("algorithm: <empty-required-field>");
+		}
+		
+		if (parameters != null) {
+			sb.append(",\n");
+			for (int i = 0; i < indentLevel + 1; i++) {
+				sb.append("\t");
+			}
+			sb.append("parameters: ").append(parameters);
+		}
+		
+		sb.append("\n");
+		for (int i = 0; i < indentLevel; i++) {
+			sb.append("\t");
+		}
+		sb.append("}");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/Attribute.java

@@ -0,0 +1,317 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class Attribute implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static class Values implements BerType, Serializable {
+
+		private static final long serialVersionUID = 1L;
+
+		public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 17);
+		private byte[] code = null;
+		private List<AttributeValue> seqOf = null;
+
+		public Values() {
+			seqOf = new ArrayList<>();
+		}
+
+		public Values(byte[] code) {
+			this.code = code;
+		}
+
+		public List<AttributeValue> getAttributeValue() {
+			if (seqOf == null) {
+				seqOf = new ArrayList<>();
+			}
+			return seqOf;
+		}
+
+		@Override public int encode(OutputStream reverseOS) throws IOException {
+			return encode(reverseOS, true);
+		}
+
+		public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+			if (code != null) {
+				reverseOS.write(code);
+				if (withTag) {
+					return tag.encode(reverseOS) + code.length;
+				}
+				return code.length;
+			}
+
+			int codeLength = 0;
+			for (int i = (seqOf.size() - 1); i >= 0; i--) {
+				codeLength += seqOf.get(i).encode(reverseOS);
+			}
+
+			codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+			if (withTag) {
+				codeLength += tag.encode(reverseOS);
+			}
+
+			return codeLength;
+		}
+
+		@Override public int decode(InputStream is) throws IOException {
+			return decode(is, true);
+		}
+
+		public int decode(InputStream is, boolean withTag) throws IOException {
+			int tlByteCount = 0;
+			int vByteCount = 0;
+			int numDecodedBytes;
+			BerTag berTag = new BerTag();
+			if (withTag) {
+				tlByteCount += tag.decodeAndCheck(is);
+			}
+
+			BerLength length = new BerLength();
+			tlByteCount += length.decode(is);
+			int lengthVal = length.val;
+
+			while (vByteCount < lengthVal || lengthVal < 0) {
+				vByteCount += berTag.decode(is);
+
+				if (lengthVal < 0 && berTag.equals(0, 0, 0)) {
+					vByteCount += BerLength.readEocByte(is);
+					break;
+				}
+
+				AttributeValue element = new AttributeValue();
+				numDecodedBytes = element.decode(is, berTag);
+				if (numDecodedBytes == 0) {
+					throw new IOException("Tag did not match");
+				}
+				vByteCount += numDecodedBytes;
+				seqOf.add(element);
+			}
+			if (lengthVal >= 0 && vByteCount != lengthVal) {
+				throw new IOException("Decoded SequenceOf or SetOf has wrong length. Expected " + lengthVal + " but has " + vByteCount);
+
+			}
+			return tlByteCount + vByteCount;
+		}
+
+		public void encodeAndSave(int encodingSizeGuess) throws IOException {
+			ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+			encode(reverseOS, false);
+			code = reverseOS.getArray();
+		}
+
+		@Override public String toString() {
+			StringBuilder sb = new StringBuilder();
+			appendAsString(sb, 0);
+			return sb.toString();
+		}
+
+		public void appendAsString(StringBuilder sb, int indentLevel) {
+
+			sb.append("{\n");
+			for (int i = 0; i < indentLevel + 1; i++) {
+				sb.append("\t");
+			}
+			if (seqOf == null) {
+				sb.append("null");
+			}
+			else {
+				Iterator<AttributeValue> it = seqOf.iterator();
+				if (it.hasNext()) {
+					sb.append(it.next());
+					while (it.hasNext()) {
+						sb.append(",\n");
+						for (int i = 0; i < indentLevel + 1; i++) {
+							sb.append("\t");
+						}
+						sb.append(it.next());
+					}
+				}
+			}
+
+			sb.append("\n");
+			for (int i = 0; i < indentLevel; i++) {
+				sb.append("\t");
+			}
+			sb.append("}");
+		}
+
+	}
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+
+	private byte[] code = null;
+	private AttributeType type = null;
+	private Values values = null;
+	
+	public Attribute() {
+	}
+
+	public Attribute(byte[] code) {
+		this.code = code;
+	}
+
+	public void setType(AttributeType type) {
+		this.type = type;
+	}
+
+	public AttributeType getType() {
+		return type;
+	}
+
+	public void setValues(Values values) {
+		this.values = values;
+	}
+
+	public Values getValues() {
+		return values;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		codeLength += values.encode(reverseOS, true);
+		
+		codeLength += type.encode(reverseOS, true);
+		
+		codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+		if (withTag) {
+			codeLength += tag.encode(reverseOS);
+		}
+
+		return codeLength;
+
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlByteCount = 0;
+		int vByteCount = 0;
+		BerTag berTag = new BerTag();
+
+		if (withTag) {
+			tlByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength length = new BerLength();
+		tlByteCount += length.decode(is);
+		int lengthVal = length.val;
+		vByteCount += berTag.decode(is);
+
+		if (berTag.equals(AttributeType.tag)) {
+			type = new AttributeType();
+			vByteCount += type.decode(is, false);
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		if (berTag.equals(Values.tag)) {
+			values = new Values();
+			vByteCount += values.decode(is, false);
+			if (lengthVal >= 0 && vByteCount == lengthVal) {
+				return tlByteCount + vByteCount;
+			}
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		if (lengthVal < 0) {
+			if (!berTag.equals(0, 0, 0)) {
+				throw new IOException("Decoded sequence has wrong end of contents octets");
+			}
+			vByteCount += BerLength.readEocByte(is);
+			return tlByteCount + vByteCount;
+		}
+
+		throw new IOException("Unexpected end of sequence, length tag: " + lengthVal + ", bytes decoded: " + vByteCount);
+
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		sb.append("{");
+		sb.append("\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (type != null) {
+			sb.append("type: ").append(type);
+		}
+		else {
+			sb.append("type: <empty-required-field>");
+		}
+		
+		sb.append(",\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (values != null) {
+			sb.append("values: ");
+			values.appendAsString(sb, indentLevel + 1);
+		}
+		else {
+			sb.append("values: <empty-required-field>");
+		}
+		
+		sb.append("\n");
+		for (int i = 0; i < indentLevel; i++) {
+			sb.append("\t");
+		}
+		sb.append("}");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/AttributeType.java

@@ -0,0 +1,38 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class AttributeType extends BerObjectIdentifier {
+
+	private static final long serialVersionUID = 1L;
+
+	public AttributeType() {
+	}
+
+	public AttributeType(byte[] code) {
+		super(code);
+	}
+
+	public AttributeType(int[] value) {
+		super(value);
+	}
+
+}

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/AttributeTypeAndValue.java

@@ -0,0 +1,182 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class AttributeTypeAndValue implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+
+	private byte[] code = null;
+	private AttributeType type = null;
+	private AttributeValue value = null;
+	
+	public AttributeTypeAndValue() {
+	}
+
+	public AttributeTypeAndValue(byte[] code) {
+		this.code = code;
+	}
+
+	public void setType(AttributeType type) {
+		this.type = type;
+	}
+
+	public AttributeType getType() {
+		return type;
+	}
+
+	public void setValue(AttributeValue value) {
+		this.value = value;
+	}
+
+	public AttributeValue getValue() {
+		return value;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		codeLength += value.encode(reverseOS);
+		
+		codeLength += type.encode(reverseOS, true);
+		
+		codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+		if (withTag) {
+			codeLength += tag.encode(reverseOS);
+		}
+
+		return codeLength;
+
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlByteCount = 0;
+		int vByteCount = 0;
+		int numDecodedBytes;
+		BerTag berTag = new BerTag();
+
+		if (withTag) {
+			tlByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength length = new BerLength();
+		tlByteCount += length.decode(is);
+		int lengthVal = length.val;
+		vByteCount += berTag.decode(is);
+
+		if (berTag.equals(AttributeType.tag)) {
+			type = new AttributeType();
+			vByteCount += type.decode(is, false);
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		value = new AttributeValue();
+		numDecodedBytes = value.decode(is, berTag);
+		if (numDecodedBytes != 0) {
+			vByteCount += numDecodedBytes;
+			if (lengthVal >= 0 && vByteCount == lengthVal) {
+				return tlByteCount + vByteCount;
+			}
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		if (lengthVal < 0) {
+			if (!berTag.equals(0, 0, 0)) {
+				throw new IOException("Decoded sequence has wrong end of contents octets");
+			}
+			vByteCount += BerLength.readEocByte(is);
+			return tlByteCount + vByteCount;
+		}
+
+		throw new IOException("Unexpected end of sequence, length tag: " + lengthVal + ", bytes decoded: " + vByteCount);
+
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		sb.append("{");
+		sb.append("\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (type != null) {
+			sb.append("type: ").append(type);
+		}
+		else {
+			sb.append("type: <empty-required-field>");
+		}
+		
+		sb.append(",\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (value != null) {
+			sb.append("value: ").append(value);
+		}
+		else {
+			sb.append("value: <empty-required-field>");
+		}
+		
+		sb.append("\n");
+		for (int i = 0; i < indentLevel; i++) {
+			sb.append("\t");
+		}
+		sb.append("}");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/AttributeValue.java

@@ -0,0 +1,34 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class AttributeValue extends BerAny {
+
+	private static final long serialVersionUID = 1L;
+
+	public AttributeValue() {
+	}
+
+	public AttributeValue(byte[] value) {
+		super(value);
+	}
+
+}

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/BuiltInDomainDefinedAttribute.java

@@ -0,0 +1,181 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class BuiltInDomainDefinedAttribute implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+
+	private byte[] code = null;
+	private BerPrintableString type = null;
+	private BerPrintableString value = null;
+	
+	public BuiltInDomainDefinedAttribute() {
+	}
+
+	public BuiltInDomainDefinedAttribute(byte[] code) {
+		this.code = code;
+	}
+
+	public void setType(BerPrintableString type) {
+		this.type = type;
+	}
+
+	public BerPrintableString getType() {
+		return type;
+	}
+
+	public void setValue(BerPrintableString value) {
+		this.value = value;
+	}
+
+	public BerPrintableString getValue() {
+		return value;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		codeLength += value.encode(reverseOS, true);
+		
+		codeLength += type.encode(reverseOS, true);
+		
+		codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+		if (withTag) {
+			codeLength += tag.encode(reverseOS);
+		}
+
+		return codeLength;
+
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlByteCount = 0;
+		int vByteCount = 0;
+		BerTag berTag = new BerTag();
+
+		if (withTag) {
+			tlByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength length = new BerLength();
+		tlByteCount += length.decode(is);
+		int lengthVal = length.val;
+		vByteCount += berTag.decode(is);
+
+		if (berTag.equals(BerPrintableString.tag)) {
+			type = new BerPrintableString();
+			vByteCount += type.decode(is, false);
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		if (berTag.equals(BerPrintableString.tag)) {
+			value = new BerPrintableString();
+			vByteCount += value.decode(is, false);
+			if (lengthVal >= 0 && vByteCount == lengthVal) {
+				return tlByteCount + vByteCount;
+			}
+			vByteCount += berTag.decode(is);
+		}
+		else {
+			throw new IOException("Tag does not match mandatory sequence component.");
+		}
+		
+		if (lengthVal < 0) {
+			if (!berTag.equals(0, 0, 0)) {
+				throw new IOException("Decoded sequence has wrong end of contents octets");
+			}
+			vByteCount += BerLength.readEocByte(is);
+			return tlByteCount + vByteCount;
+		}
+
+		throw new IOException("Unexpected end of sequence, length tag: " + lengthVal + ", bytes decoded: " + vByteCount);
+
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		sb.append("{");
+		sb.append("\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (type != null) {
+			sb.append("type: ").append(type);
+		}
+		else {
+			sb.append("type: <empty-required-field>");
+		}
+		
+		sb.append(",\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (value != null) {
+			sb.append("value: ").append(value);
+		}
+		else {
+			sb.append("value: <empty-required-field>");
+		}
+		
+		sb.append("\n");
+		for (int i = 0; i < indentLevel; i++) {
+			sb.append("\t");
+		}
+		sb.append("}");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/BuiltInDomainDefinedAttributes.java

@@ -0,0 +1,155 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class BuiltInDomainDefinedAttributes implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+	private byte[] code = null;
+	private List<BuiltInDomainDefinedAttribute> seqOf = null;
+
+	public BuiltInDomainDefinedAttributes() {
+		seqOf = new ArrayList<>();
+	}
+
+	public BuiltInDomainDefinedAttributes(byte[] code) {
+		this.code = code;
+	}
+
+	public List<BuiltInDomainDefinedAttribute> getBuiltInDomainDefinedAttribute() {
+		if (seqOf == null) {
+			seqOf = new ArrayList<>();
+		}
+		return seqOf;
+	}
+
+	@Override public int encode(OutputStream reverseOS) throws IOException {
+		return encode(reverseOS, true);
+	}
+
+	public int encode(OutputStream reverseOS, boolean withTag) throws IOException {
+
+		if (code != null) {
+			reverseOS.write(code);
+			if (withTag) {
+				return tag.encode(reverseOS) + code.length;
+			}
+			return code.length;
+		}
+
+		int codeLength = 0;
+		for (int i = (seqOf.size() - 1); i >= 0; i--) {
+			codeLength += seqOf.get(i).encode(reverseOS, true);
+		}
+
+		codeLength += BerLength.encodeLength(reverseOS, codeLength);
+
+		if (withTag) {
+			codeLength += tag.encode(reverseOS);
+		}
+
+		return codeLength;
+	}
+
+	@Override public int decode(InputStream is) throws IOException {
+		return decode(is, true);
+	}
+
+	public int decode(InputStream is, boolean withTag) throws IOException {
+		int tlByteCount = 0;
+		int vByteCount = 0;
+		BerTag berTag = new BerTag();
+		if (withTag) {
+			tlByteCount += tag.decodeAndCheck(is);
+		}
+
+		BerLength length = new BerLength();
+		tlByteCount += length.decode(is);
+		int lengthVal = length.val;
+
+		while (vByteCount < lengthVal || lengthVal < 0) {
+			vByteCount += berTag.decode(is);
+
+			if (lengthVal < 0 && berTag.equals(0, 0, 0)) {
+				vByteCount += BerLength.readEocByte(is);
+				break;
+			}
+
+			if (!berTag.equals(BuiltInDomainDefinedAttribute.tag)) {
+				throw new IOException("Tag does not match mandatory sequence of/set of component.");
+			}
+			BuiltInDomainDefinedAttribute element = new BuiltInDomainDefinedAttribute();
+			vByteCount += element.decode(is, false);
+			seqOf.add(element);
+		}
+		if (lengthVal >= 0 && vByteCount != lengthVal) {
+			throw new IOException("Decoded SequenceOf or SetOf has wrong length. Expected " + lengthVal + " but has " + vByteCount);
+
+		}
+		return tlByteCount + vByteCount;
+	}
+
+	public void encodeAndSave(int encodingSizeGuess) throws IOException {
+		ReverseByteArrayOutputStream reverseOS = new ReverseByteArrayOutputStream(encodingSizeGuess);
+		encode(reverseOS, false);
+		code = reverseOS.getArray();
+	}
+
+	@Override public String toString() {
+		StringBuilder sb = new StringBuilder();
+		appendAsString(sb, 0);
+		return sb.toString();
+	}
+
+	public void appendAsString(StringBuilder sb, int indentLevel) {
+
+		sb.append("{\n");
+		for (int i = 0; i < indentLevel + 1; i++) {
+			sb.append("\t");
+		}
+		if (seqOf == null) {
+			sb.append("null");
+		}
+		else {
+			Iterator<BuiltInDomainDefinedAttribute> it = seqOf.iterator();
+			if (it.hasNext()) {
+				it.next().appendAsString(sb, indentLevel + 1);
+				while (it.hasNext()) {
+					sb.append(",\n");
+					for (int i = 0; i < indentLevel + 1; i++) {
+						sb.append("\t");
+					}
+					it.next().appendAsString(sb, indentLevel + 1);
+				}
+			}
+		}
+
+		sb.append("\n");
+		for (int i = 0; i < indentLevel; i++) {
+			sb.append("\t");
+		}
+		sb.append("}");
+	}
+
+}
+

libs/lpad-sm-dp-plus-connector/src/generated/asn1/com/truphone/rsp/dto/asn1/pkix1explicit88/BuiltInStandardAttributes.java

@@ -0,0 +1,446 @@
+/*
+ * This class file was automatically generated by ASN1bean v1.13.0 (http://www.beanit.com)
+ */
+
+package com.truphone.rsp.dto.asn1.pkix1explicit88;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.io.Serializable;
+import com.beanit.asn1bean.ber.*;
+import com.beanit.asn1bean.ber.types.*;
+import com.beanit.asn1bean.ber.types.string.*;
+
+
+public class BuiltInStandardAttributes implements BerType, Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final BerTag tag = new BerTag(BerTag.UNIVERSAL_CLASS, BerTag.CONSTRUCTED, 16);
+
+	private byte[] code = null;
+	private CountryName countryName = null;
+	private AdministrationDomainName administrationDomainName = null;
+	private NetworkAddress networkAddress = null;
+	private TerminalIdentifier terminalIdentifier = null;
+	private PrivateDomainName privateDomainName = null;
+	private OrganizationName organizationName = null;
+	private NumericUserIdentifier numericUserIdentifier = null;
+	private PersonalName personalName = null;
+	private OrganizationalUnitNames organizationalUnitNames = null;
+	
+	public BuiltInStandardAttributes() {
+	}
+
+	public BuiltInStandardAttributes(byte[] code) {
+		this.code = code;
+	}
+
+	public void setCountryName(CountryName countryName) {
+		this.countryName = countryName;
+	}
+
+	public CountryName getCountryName() {
+		return countryName;
+	}
+
+	public void setAdministrationDomainName(AdministrationDomainName administrationDomainName) {
+		this.administrationDomainName = administrationDomainName;
+	}
+
+	public AdministrationDomainName getAdministrationDomainName() {
+		return administrationDomainName;
+	}
+
+	public void setNetworkAddress(NetworkAddress networkAddress) {
+		this.networkAddress = networkAddress;
+	}
+
+	public NetworkAddress getNetworkAddress() {
+		return networkAddress;
+	}
+
+	public void setTerminalIdentifier(TerminalIdentifier terminalIdentifier) {
+		this.terminalIdentifier = terminalIdentifier;
+	}
+
+	public TerminalIdentifier getTerminalIdentifier() {
+		return terminalIdentifier;
+	}
+
+	public void setPrivateDomainName(PrivateDomainName privateDomainName) {
+		this.privateDomainName = privateDomainName;
+	}
+
+	public PrivateDomainName getPrivateDomainName() {
+		return privateDomainName;
+	}
+
+	public void setOrganizationName(OrganizationName organizationName) {
+		this.organizationName = organizationName;
+	}
+
+	public OrganizationName getOrganizationName() {
+		return organizationName;
+	}
+
+	public void setNumericUserIdentifier(NumericUserIdentifier numericUserIdentifier) {
+		this.numericUserIdentifier = numericUserIdentifier;
+	}
+
+	public NumericUserIdentifier getNumericUserIdentifier() {
+		return numericUserIdentifier;
+	}
+
+	public void setPersonalName(PersonalName personalName) {