diff --git a/CHANGELOG.md b/CHANGELOG.md index 05d72dc1..b64662ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,11 @@ * `Iterable.decodeAsn1VarUInt()` * `ByteArray.decodeAsn1VarUInt()` * Revamp implicit tagging +* More consistent low-level encoding and decoding function names: + * `encodeToAsn1Primitive` to produce an `Asn1Primitive` that can directly be DER-encoded + * `encodeToAsn1ContentBytes` to produce the content bytes of a TLV primitive (the _V_ in TLV) + * `decodeToXXX` to be invoked on an `Asn1Primitive` to decode a DER-encoded primitive into the target type + * `decodeFromAsn1ContentBytes` to be invoked on the companion of the target type to decode the content bytes of a TLV primitive (the _V_ in TLV) ## 3.0 diff --git a/indispensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/io/JwsCertificateSerializer.kt b/indispensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/io/JwsCertificateSerializer.kt index ddd282b6..21e849a3 100644 --- a/indispensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/io/JwsCertificateSerializer.kt +++ b/indispensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/io/JwsCertificateSerializer.kt @@ -7,5 +7,5 @@ import at.asitplus.signum.indispensable.pki.X509Certificate object JwsCertificateSerializer : TransformingSerializerTemplate( parent = ByteArrayBase64Serializer, encodeAs = X509Certificate::encodeToDer, - decodeAs = { X509Certificate.decodeFromDer(it) } //workaround iOS compilation bug + decodeAs = { X509Certificate.decodeFromDer(it) } //workaround iOS compilation bug KT-71498 ) diff --git a/indispensable/src/commonMain/kotlin/at/asitplus/signum/indispensable/io/Encoding.kt b/indispensable/src/commonMain/kotlin/at/asitplus/signum/indispensable/io/Encoding.kt index 444a6443..014c1593 100644 --- a/indispensable/src/commonMain/kotlin/at/asitplus/signum/indispensable/io/Encoding.kt +++ b/indispensable/src/commonMain/kotlin/at/asitplus/signum/indispensable/io/Encoding.kt @@ -82,7 +82,7 @@ object ByteArrayBase64UrlSerializer: TransformingSerializerTemplate( parent = ByteArrayBase64UrlSerializer, encodeAs = X509Certificate::encodeToDer, - decodeAs = { X509Certificate.decodeFromDer(it) } // workaround iOS compilation bug + decodeAs = { X509Certificate.decodeFromDer(it) } // workaround iOS compilation bug KT-71498 ) /** De-/serializes a public key as a Base64Url-encoded IOS encoding public key */