Skip to content

Commit 26225ab

Browse files
StjepanovicSrdjanStjepanovicSrdjan
committed
update changelog
1 parent 0d12dcb commit 26225ab

File tree

4 files changed

+32
-9
lines changed

4 files changed

+32
-9
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## NEXT
44

55
## 0.2.0
6-
* Add methods for parsing `ByteArray` representing `IpNetwork` in X509 `IpAddressName`
6+
* Add methods in `IpAddressAndPrefix` interface for parsing `ByteArray` representing address and subnet mask in X509 `IpAddressName`
77
* `fromX509Octets`
88
* `toX509Octets`
99
* Revised generic type arguments

‎cidre/api/android/cidre.api‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public final class at/asitplus/cidre/IpAddress$V6$Companion : at/asitplus/cidre/
109109
}
110110

111111
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix {
112+
public static final field Companion Lat/asitplus/cidre/IpAddressAndPrefix$Companion;
112113
public abstract fun getAddress ()Lat/asitplus/cidre/IpAddress;
113114
public fun getFamily ()Lat/asitplus/cidre/IpFamily;
114115
public fun getHostMask ()[B
@@ -118,12 +119,17 @@ public abstract interface class at/asitplus/cidre/IpAddressAndPrefix {
118119
public abstract fun isLinkLocal ()Z
119120
public abstract fun isLoopback ()Z
120121
public abstract fun isMulticast ()Z
122+
public fun toX509Octets ()[B
123+
}
124+
125+
public final class at/asitplus/cidre/IpAddressAndPrefix$Companion {
121126
}
122127

123128
public final class at/asitplus/cidre/IpAddressAndPrefix$DefaultImpls {
124129
public static fun getFamily (Lat/asitplus/cidre/IpAddressAndPrefix;)Lat/asitplus/cidre/IpFamily;
125130
public static fun getHostMask (Lat/asitplus/cidre/IpAddressAndPrefix;)[B
126131
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix;)I
132+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix;)[B
127133
}
128134

129135
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix$V4 : at/asitplus/cidre/IpAddressAndPrefix {
@@ -140,6 +146,7 @@ public final class at/asitplus/cidre/IpAddressAndPrefix$V4$DefaultImpls {
140146
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)I
141147
public static fun netmaskToString (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)Ljava/lang/String;
142148
public static fun toString (Lat/asitplus/cidre/IpAddressAndPrefix$V4;Z)Ljava/lang/String;
149+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)[B
143150
}
144151

145152
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix$V6 : at/asitplus/cidre/IpAddressAndPrefix {
@@ -160,6 +167,7 @@ public final class at/asitplus/cidre/IpAddressAndPrefix$V6$DefaultImpls {
160167
public static fun getHostMask (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)[B
161168
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)I
162169
public static fun toString (Lat/asitplus/cidre/IpAddressAndPrefix$V6;Z)Ljava/lang/String;
170+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)[B
163171
}
164172

165173
public final class at/asitplus/cidre/IpAddressAndPrefixKt {
@@ -213,9 +221,11 @@ public abstract class at/asitplus/cidre/IpInterface : at/asitplus/cidre/IpAddres
213221
public fun isLoopback ()Z
214222
public fun isMulticast ()Z
215223
public fun toString ()Ljava/lang/String;
224+
public fun toX509Octets ()[B
216225
}
217226

218227
public final class at/asitplus/cidre/IpInterface$Companion {
228+
public final fun fromX509Octets ([B)Lat/asitplus/cidre/IpInterface;
219229
public final fun invoke (Ljava/lang/String;)Lat/asitplus/cidre/IpInterface;
220230
public final fun invoke-Qn1smSk (Lat/asitplus/cidre/IpAddress;I)Lat/asitplus/cidre/IpInterface;
221231
}
@@ -278,13 +288,12 @@ public abstract class at/asitplus/cidre/IpNetwork : at/asitplus/cidre/IpAddressA
278288
public final fun overlaps (Lat/asitplus/cidre/IpNetwork;)Z
279289
public final fun plus (Lat/asitplus/cidre/IpNetwork;)Lat/asitplus/cidre/IpNetwork;
280290
public fun toString ()Ljava/lang/String;
281-
public final fun toX509Octets ()[B
291+
public fun toX509Octets ()[B
282292
}
283293

284294
public final class at/asitplus/cidre/IpNetwork$Companion {
285295
public final fun forAddress-Qn1smSk (Lat/asitplus/cidre/IpAddress;I)Lat/asitplus/cidre/IpNetwork;
286-
public final fun fromX509Octets ([BZ)Lat/asitplus/cidre/IpNetwork;
287-
public static synthetic fun fromX509Octets$default (Lat/asitplus/cidre/IpNetwork$Companion;[BZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
296+
public final fun fromX509Octets ([B)Lat/asitplus/cidre/IpNetwork;
288297
public final fun invoke (Ljava/lang/String;Z)Lat/asitplus/cidre/IpNetwork;
289298
public static synthetic fun invoke$default (Lat/asitplus/cidre/IpNetwork$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
290299
public final fun invoke-OsBMiQA (Lat/asitplus/cidre/IpAddress;IZ)Lat/asitplus/cidre/IpNetwork;

‎cidre/api/cidre.klib.api‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ sealed interface <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B
123123
open val numberOfHostBits // at.asitplus.cidre/IpAddressAndPrefix.numberOfHostBits|{}numberOfHostBits[0]
124124
open fun <get-numberOfHostBits>(): kotlin/UInt // at.asitplus.cidre/IpAddressAndPrefix.numberOfHostBits.<get-numberOfHostBits>|<get-numberOfHostBits>(){}[0]
125125

126+
open fun toX509Octets(): kotlin/ByteArray // at.asitplus.cidre/IpAddressAndPrefix.toX509Octets|toX509Octets(){}[0]
127+
126128
sealed interface V4 : at.asitplus.cidre/IpAddressAndPrefix<kotlin/Byte, at.asitplus.cidre.byteops/CidrNumber.V4> { // at.asitplus.cidre/IpAddressAndPrefix.V4|null[0]
127129
abstract val address // at.asitplus.cidre/IpAddressAndPrefix.V4.address|{}address[0]
128130
abstract fun <get-address>(): at.asitplus.cidre/IpAddress.V4 // at.asitplus.cidre/IpAddressAndPrefix.V4.address.<get-address>|<get-address>(){}[0]
@@ -157,6 +159,8 @@ sealed interface <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B
157159

158160
open fun toString(kotlin/Boolean): kotlin/String // at.asitplus.cidre/IpAddressAndPrefix.V6.toString|toString(kotlin.Boolean){}[0]
159161
}
162+
163+
final object Companion // at.asitplus.cidre/IpAddressAndPrefix.Companion|null[0]
160164
}
161165

162166
sealed interface at.asitplus.cidre/IpFamily { // at.asitplus.cidre/IpFamily|null[0]
@@ -328,6 +332,7 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
328332
open fun <get-prefix>(): kotlin/UInt // at.asitplus.cidre/IpInterface.prefix.<get-prefix>|<get-prefix>(){}[0]
329333

330334
open fun toString(): kotlin/String // at.asitplus.cidre/IpInterface.toString|toString(){}[0]
335+
open fun toX509Octets(): kotlin/ByteArray // at.asitplus.cidre/IpInterface.toX509Octets|toX509Octets(){}[0]
331336

332337
final class V4 : at.asitplus.cidre/IpInterface<kotlin/Byte, at.asitplus.cidre.byteops/CidrNumber.V4> { // at.asitplus.cidre/IpInterface.V4|null[0]
333338
constructor <init>(at.asitplus.cidre/IpAddress.V4, kotlin/UInt) // at.asitplus.cidre/IpInterface.V4.<init>|<init>(at.asitplus.cidre.IpAddress.V4;kotlin.UInt){}[0]
@@ -354,6 +359,7 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
354359

355360
final object Companion { // at.asitplus.cidre/IpInterface.Companion|null[0]
356361
final fun <#A2: kotlin/Number, #B2: at.asitplus.cidre.byteops/CidrNumber<#B2>> invoke(at.asitplus.cidre/IpAddress<#A2, #B2>, kotlin/UInt): at.asitplus.cidre/IpInterface<#A2, #B2> // at.asitplus.cidre/IpInterface.Companion.invoke|invoke(at.asitplus.cidre.IpAddress<0:0,0:1>;kotlin.UInt){0§<kotlin.Number>;1§<at.asitplus.cidre.byteops.CidrNumber<0:1>>}[0]
362+
final fun fromX509Octets(kotlin/ByteArray): at.asitplus.cidre/IpInterface<*, *> // at.asitplus.cidre/IpInterface.Companion.fromX509Octets|fromX509Octets(kotlin.ByteArray){}[0]
357363
final fun invoke(kotlin/String): at.asitplus.cidre/IpInterface<*, *> // at.asitplus.cidre/IpInterface.Companion.invoke|invoke(kotlin.String){}[0]
358364
}
359365
}
@@ -397,7 +403,6 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
397403
final fun isSupernetOf(at.asitplus.cidre/IpNetwork<#A, #B>): kotlin/Boolean // at.asitplus.cidre/IpNetwork.isSupernetOf|isSupernetOf(at.asitplus.cidre.IpNetwork<1:0,1:1>){}[0]
398404
final fun overlaps(at.asitplus.cidre/IpNetwork<#A, #B>): kotlin/Boolean // at.asitplus.cidre/IpNetwork.overlaps|overlaps(at.asitplus.cidre.IpNetwork<1:0,1:1>){}[0]
399405
final fun plus(at.asitplus.cidre/IpNetwork<#A, #B>): at.asitplus.cidre/IpNetwork<#A, #B>? // at.asitplus.cidre/IpNetwork.plus|plus(at.asitplus.cidre.IpNetwork<1:0,1:1>){}[0]
400-
final fun toX509Octets(): kotlin/ByteArray // at.asitplus.cidre/IpNetwork.toX509Octets|toX509Octets(){}[0]
401406
open fun compareTo(at.asitplus.cidre/IpNetwork<#A, #B>): kotlin/Int // at.asitplus.cidre/IpNetwork.compareTo|compareTo(at.asitplus.cidre.IpNetwork<1:0,1:1>){}[0]
402407
open fun equals(kotlin/Any?): kotlin/Boolean // at.asitplus.cidre/IpNetwork.equals|equals(kotlin.Any?){}[0]
403408
open fun hashCode(): kotlin/Int // at.asitplus.cidre/IpNetwork.hashCode|hashCode(){}[0]
@@ -518,7 +523,7 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
518523
final object Companion { // at.asitplus.cidre/IpNetwork.Companion|null[0]
519524
final fun <#A2: kotlin/Number, #B2: at.asitplus.cidre.byteops/CidrNumber<#B2>> forAddress(at.asitplus.cidre/IpAddress<#A2, #B2>, kotlin/UInt): at.asitplus.cidre/IpNetwork<#A2, #B2> // at.asitplus.cidre/IpNetwork.Companion.forAddress|forAddress(at.asitplus.cidre.IpAddress<0:0,0:1>;kotlin.UInt){0§<kotlin.Number>;1§<at.asitplus.cidre.byteops.CidrNumber<0:1>>}[0]
520525
final fun <#A2: kotlin/Number, #B2: at.asitplus.cidre.byteops/CidrNumber<#B2>> invoke(at.asitplus.cidre/IpAddress<#A2, #B2>, kotlin/UInt, kotlin/Boolean = ...): at.asitplus.cidre/IpNetwork<#A2, #B2> // at.asitplus.cidre/IpNetwork.Companion.invoke|invoke(at.asitplus.cidre.IpAddress<0:0,0:1>;kotlin.UInt;kotlin.Boolean){0§<kotlin.Number>;1§<at.asitplus.cidre.byteops.CidrNumber<0:1>>}[0]
521-
final fun fromX509Octets(kotlin/ByteArray, kotlin/Boolean = ...): at.asitplus.cidre/IpNetwork<*, *> // at.asitplus.cidre/IpNetwork.Companion.fromX509Octets|fromX509Octets(kotlin.ByteArray;kotlin.Boolean){}[0]
526+
final fun fromX509Octets(kotlin/ByteArray): at.asitplus.cidre/IpNetwork<*, *> // at.asitplus.cidre/IpNetwork.Companion.fromX509Octets|fromX509Octets(kotlin.ByteArray){}[0]
522527
final fun invoke(kotlin/String, kotlin/Boolean = ...): at.asitplus.cidre/IpNetwork<*, *> // at.asitplus.cidre/IpNetwork.Companion.invoke|invoke(kotlin.String;kotlin.Boolean){}[0]
523528
}
524529
}

‎cidre/api/jvm/cidre.api‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public final class at/asitplus/cidre/IpAddress$V6$Companion : at/asitplus/cidre/
100100
}
101101

102102
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix {
103+
public static final field Companion Lat/asitplus/cidre/IpAddressAndPrefix$Companion;
103104
public abstract fun getAddress ()Lat/asitplus/cidre/IpAddress;
104105
public fun getFamily ()Lat/asitplus/cidre/IpFamily;
105106
public fun getHostMask ()[B
@@ -109,12 +110,17 @@ public abstract interface class at/asitplus/cidre/IpAddressAndPrefix {
109110
public abstract fun isLinkLocal ()Z
110111
public abstract fun isLoopback ()Z
111112
public abstract fun isMulticast ()Z
113+
public fun toX509Octets ()[B
114+
}
115+
116+
public final class at/asitplus/cidre/IpAddressAndPrefix$Companion {
112117
}
113118

114119
public final class at/asitplus/cidre/IpAddressAndPrefix$DefaultImpls {
115120
public static fun getFamily (Lat/asitplus/cidre/IpAddressAndPrefix;)Lat/asitplus/cidre/IpFamily;
116121
public static fun getHostMask (Lat/asitplus/cidre/IpAddressAndPrefix;)[B
117122
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix;)I
123+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix;)[B
118124
}
119125

120126
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix$V4 : at/asitplus/cidre/IpAddressAndPrefix {
@@ -131,6 +137,7 @@ public final class at/asitplus/cidre/IpAddressAndPrefix$V4$DefaultImpls {
131137
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)I
132138
public static fun netmaskToString (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)Ljava/lang/String;
133139
public static fun toString (Lat/asitplus/cidre/IpAddressAndPrefix$V4;Z)Ljava/lang/String;
140+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix$V4;)[B
134141
}
135142

136143
public abstract interface class at/asitplus/cidre/IpAddressAndPrefix$V6 : at/asitplus/cidre/IpAddressAndPrefix {
@@ -151,6 +158,7 @@ public final class at/asitplus/cidre/IpAddressAndPrefix$V6$DefaultImpls {
151158
public static fun getHostMask (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)[B
152159
public static fun getNumberOfHostBits-pVg5ArA (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)I
153160
public static fun toString (Lat/asitplus/cidre/IpAddressAndPrefix$V6;Z)Ljava/lang/String;
161+
public static fun toX509Octets (Lat/asitplus/cidre/IpAddressAndPrefix$V6;)[B
154162
}
155163

156164
public final class at/asitplus/cidre/IpAddressAndPrefixKt {
@@ -204,9 +212,11 @@ public abstract class at/asitplus/cidre/IpInterface : at/asitplus/cidre/IpAddres
204212
public fun isLoopback ()Z
205213
public fun isMulticast ()Z
206214
public fun toString ()Ljava/lang/String;
215+
public fun toX509Octets ()[B
207216
}
208217

209218
public final class at/asitplus/cidre/IpInterface$Companion {
219+
public final fun fromX509Octets ([B)Lat/asitplus/cidre/IpInterface;
210220
public final fun invoke (Ljava/lang/String;)Lat/asitplus/cidre/IpInterface;
211221
public final fun invoke-Qn1smSk (Lat/asitplus/cidre/IpAddress;I)Lat/asitplus/cidre/IpInterface;
212222
}
@@ -269,13 +279,12 @@ public abstract class at/asitplus/cidre/IpNetwork : at/asitplus/cidre/IpAddressA
269279
public final fun overlaps (Lat/asitplus/cidre/IpNetwork;)Z
270280
public final fun plus (Lat/asitplus/cidre/IpNetwork;)Lat/asitplus/cidre/IpNetwork;
271281
public fun toString ()Ljava/lang/String;
272-
public final fun toX509Octets ()[B
282+
public fun toX509Octets ()[B
273283
}
274284

275285
public final class at/asitplus/cidre/IpNetwork$Companion {
276286
public final fun forAddress-Qn1smSk (Lat/asitplus/cidre/IpAddress;I)Lat/asitplus/cidre/IpNetwork;
277-
public final fun fromX509Octets ([BZ)Lat/asitplus/cidre/IpNetwork;
278-
public static synthetic fun fromX509Octets$default (Lat/asitplus/cidre/IpNetwork$Companion;[BZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
287+
public final fun fromX509Octets ([B)Lat/asitplus/cidre/IpNetwork;
279288
public final fun invoke (Ljava/lang/String;Z)Lat/asitplus/cidre/IpNetwork;
280289
public static synthetic fun invoke$default (Lat/asitplus/cidre/IpNetwork$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
281290
public final fun invoke-OsBMiQA (Lat/asitplus/cidre/IpAddress;IZ)Lat/asitplus/cidre/IpNetwork;

0 commit comments

Comments
 (0)