Skip to content

Commit 66b61dc

Browse files
update cidre api
1 parent 328bd5d commit 66b61dc

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
## NEXT
44

55
## 0.2.0
6+
* Add methods for parsing `ByteArray` representing `IpNetwork` in X509 `IpAddressName`
7+
* `fromX509Octets`
8+
* `toX509Octets`
69
* Revised generic type arguments
710
* Introduce `CidrNumber` optimized for CIDR operations
811
* `CidrNumber.V4` for IPv4

cidre/api/android/cidre.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,13 @@ public abstract class at/asitplus/cidre/IpNetwork : at/asitplus/cidre/IpAddressA
278278
public final fun overlaps (Lat/asitplus/cidre/IpNetwork;)Z
279279
public final fun plus (Lat/asitplus/cidre/IpNetwork;)Lat/asitplus/cidre/IpNetwork;
280280
public fun toString ()Ljava/lang/String;
281+
public final fun toX509Octets ()[B
281282
}
282283

283284
public final class at/asitplus/cidre/IpNetwork$Companion {
284285
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;
285288
public final fun invoke (Ljava/lang/String;Z)Lat/asitplus/cidre/IpNetwork;
286289
public static synthetic fun invoke$default (Lat/asitplus/cidre/IpNetwork$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
287290
public final fun invoke-OsBMiQA (Lat/asitplus/cidre/IpAddress;IZ)Lat/asitplus/cidre/IpNetwork;

cidre/api/cidre.klib.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
397397
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]
398398
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]
399399
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]
400401
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]
401402
open fun equals(kotlin/Any?): kotlin/Boolean // at.asitplus.cidre/IpNetwork.equals|equals(kotlin.Any?){}[0]
402403
open fun hashCode(): kotlin/Int // at.asitplus.cidre/IpNetwork.hashCode|hashCode(){}[0]
@@ -517,6 +518,7 @@ sealed class <#A: kotlin/Number, #B: at.asitplus.cidre.byteops/CidrNumber<#B>> a
517518
final object Companion { // at.asitplus.cidre/IpNetwork.Companion|null[0]
518519
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]
519520
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]
520522
final fun invoke(kotlin/String, kotlin/Boolean = ...): at.asitplus.cidre/IpNetwork<*, *> // at.asitplus.cidre/IpNetwork.Companion.invoke|invoke(kotlin.String;kotlin.Boolean){}[0]
521523
}
522524
}

cidre/api/jvm/cidre.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,13 @@ public abstract class at/asitplus/cidre/IpNetwork : at/asitplus/cidre/IpAddressA
269269
public final fun overlaps (Lat/asitplus/cidre/IpNetwork;)Z
270270
public final fun plus (Lat/asitplus/cidre/IpNetwork;)Lat/asitplus/cidre/IpNetwork;
271271
public fun toString ()Ljava/lang/String;
272+
public final fun toX509Octets ()[B
272273
}
273274

274275
public final class at/asitplus/cidre/IpNetwork$Companion {
275276
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;
276279
public final fun invoke (Ljava/lang/String;Z)Lat/asitplus/cidre/IpNetwork;
277280
public static synthetic fun invoke$default (Lat/asitplus/cidre/IpNetwork$Companion;Ljava/lang/String;ZILjava/lang/Object;)Lat/asitplus/cidre/IpNetwork;
278281
public final fun invoke-OsBMiQA (Lat/asitplus/cidre/IpAddress;IZ)Lat/asitplus/cidre/IpNetwork;

0 commit comments

Comments
 (0)