Mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-04-26 13:01:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

crypto.asn1.Oid: Reject empty OID encodings (#31983)

Browse Source 
The DER decoder accepted zero-length OID payloads producing an Oid value that would panic later.

Co-authored-by: Frank Denis <github@pureftpd.org>
Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31983
Reviewed-by: Andrew Kelley <andrew@ziglang.org>
Co-authored-by: Frank Denis <jedisct1@noreply.codeberg.org>
Co-committed-by: Frank Denis <jedisct1@noreply.codeberg.org>
This commit is contained in:
Frank Denis
2026-04-20 21:54:04 +02:00
committed by Andrew Kelley
parent 98ddebc380
commit 98cc059622
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/std/crypto/codecs/asn1/Oid.zig
+12 -1
View File
@@ -85,6 +85,14 @@ test toDot {
}
}
test "malformed OID" {
var empty: der.Decoder = .{ .bytes = &.{ 0x06, 0x00 } };
try std.testing.expectError(error.EndOfStream, decodeDer(&empty));
var truncated: der.Decoder = .{ .bytes = &.{ 0x06, 0x02, 0x2a, 0x80 } };
try std.testing.expectError(error.InvalidEncoding, decodeDer(&truncated));
}
const TestCase = struct {
encoded: []const u8,
dot_notation: []const u8,
@@ -109,7 +117,10 @@ pub const asn1_tag = asn1.Tag.init(.oid, false, .universal);
pub fn decodeDer(decoder: *der.Decoder) !Oid {
const ele = try decoder.element(asn1_tag.toExpected());
return Oid{ .encoded = decoder.view(ele) };
const encoded = decoder.view(ele);
if (encoded.len == 0) return error.EndOfStream;
if (encoded[encoded.len - 1] & 0x80 != 0) return error.InvalidEncoding;
return Oid{ .encoded = encoded };
}
pub fn encodeDer(self: Oid, encoder: *der.Encoder) !void {