Parsing X509 IpAddressName #4
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| package at.asitplus.cidre | ||
|
|
||
| import at.asitplus.cidre.IpAddressAndPrefix.Companion.parseX509Octets | ||
| import at.asitplus.cidre.byteops.CidrNumber | ||
|
|
||
|
|
||
|
|
@@ -13,6 +14,8 @@ constructor(override val prefix: Prefix, val network: IpNetwork<N, S>) : | |
|
|
||
| override fun toString(): String = "$address/$prefix" | ||
|
|
||
| override fun toX509Octets(): ByteArray = super.toX509Octets() | ||
|
|
||
| companion object { | ||
| @Suppress("UNCHECKED_CAST") | ||
| internal fun <N : Number, S: CidrNumber<S>> unsafe( | ||
|
|
@@ -39,6 +42,20 @@ constructor(override val prefix: Prefix, val network: IpNetwork<N, S>) : | |
| val (addr, prefix) = parseIpAndPrefix(stringRepresentation) | ||
| return IpInterface(addr, prefix) | ||
| } | ||
|
|
||
| /** | ||
| * Decodes an IpInterface from X.509 iPAddressName ByteArray (RFC 5280). | ||
| * IPv4: [4 bytes base address][4 bytes subnet mask] (8 bytes) | ||
| * IPv6: [16 bytes base address][16 bytes subnet mask] (32 bytes) | ||
|
||
| */ | ||
| @Throws(IllegalArgumentException::class) | ||
| fun fromX509Octets(bytes: ByteArray): IpInterface<*, *> { | ||
| val (address, prefix) = parseX509Octets(bytes) | ||
| return when (address) { | ||
| is IpAddress.V4 -> V4(address, prefix) | ||
| is IpAddress.V6 -> V6(address, prefix) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class V4 internal constructor(override val address: IpAddress.V4, prefix: Prefix, network: IpNetwork.V4) : | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| package at.asitplus.cidre | ||
|
|
||
| import at.asitplus.cidre.IpAddressAndPrefix.Companion.parseX509Octets | ||
| import at.asitplus.cidre.byteops.CidrNumber | ||
| import at.asitplus.cidre.byteops.and | ||
| import at.asitplus.cidre.byteops.or | ||
|
|
@@ -528,6 +529,19 @@ constructor(address: IpAddress<N, S>, override val prefix: Prefix, strict: Boole | |
| ) as IpNetwork<N, S> | ||
| } | ||
|
|
||
| /** | ||
| * Decodes an IpNetwork from X.509 iPAddressName ByteArray (RFC 5280). | ||
JesusMcCloud marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * IPv4: [4 bytes base address][4 bytes subnet mask] (8 bytes) | ||
| * IPv6: [16 bytes base address][16 bytes subnet mask] (32 bytes) | ||
|
||
| */ | ||
| fun fromX509Octets(bytes: ByteArray): IpNetwork<*, *> { | ||
| val (addr, prefix) = parseX509Octets(bytes) | ||
| return when (addr) { | ||
| is IpAddress.V4 -> V4(addr, prefix) | ||
| is IpAddress.V6 -> V6(addr, prefix) | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This does not render correctly, because […] is just MD syntax for a href with an internal link target of the same name as the visible text