authorgravatar for lacc97@protonmail.chLuis Cáceres <lacc97@protonmail.ch> 2023-07-23 21:02:59+00:00
committergravatar for lacc97@protonmail.chLuis Cáceres <lacc97@protonmail.ch> 2023-07-23 21:02:59+00:00
logdf5f6836c474a689469e01554997bbf3108e2cb9
treef871616f78ff722dbea34e0c7c1345a72c75911c
parent05bad1f42d06ab77967ce14ac47253f5dd6d170e

std.crypto.Certificate: consistent param types for parseTimeDigits

This commit changes the type of the first parameter of parseTimeDigits to *const [2]u8 for consistency with parseYear4 which uses *const [4]u8 as its first parameter. This is also more ergonomic for the caller since they don't need to dereference the array.

1 files changed, 19 insertions(+), 19 deletions(-)

lib/std/crypto/Certificate.zig+19-19
...@@ -538,12 +538,12 @@ pub fn parseTime(cert: Certificate, elem: der.Element) ParseTimeError!u64 {...@@ -538,12 +538,12 @@ pub fn parseTime(cert: Certificate, elem: der.Element) ParseTimeError!u64 {
538 return error.CertificateTimeInvalid;538 return error.CertificateTimeInvalid;
539539
540 return Date.toSeconds(.{540 return Date.toSeconds(.{
541 .year = @as(u16, 2000) + try parseTimeDigits(bytes[0..2].*, 0, 99),541 .year = @as(u16, 2000) + try parseTimeDigits(bytes[0..2], 0, 99),
542 .month = try parseTimeDigits(bytes[2..4].*, 1, 12),542 .month = try parseTimeDigits(bytes[2..4], 1, 12),
543 .day = try parseTimeDigits(bytes[4..6].*, 1, 31),543 .day = try parseTimeDigits(bytes[4..6], 1, 31),
544 .hour = try parseTimeDigits(bytes[6..8].*, 0, 23),544 .hour = try parseTimeDigits(bytes[6..8], 0, 23),
545 .minute = try parseTimeDigits(bytes[8..10].*, 0, 59),545 .minute = try parseTimeDigits(bytes[8..10], 0, 59),
546 .second = try parseTimeDigits(bytes[10..12].*, 0, 59),546 .second = try parseTimeDigits(bytes[10..12], 0, 59),
547 });547 });
548 },548 },
549 .generalized_time => {549 .generalized_time => {
...@@ -555,11 +555,11 @@ pub fn parseTime(cert: Certificate, elem: der.Element) ParseTimeError!u64 {...@@ -555,11 +555,11 @@ pub fn parseTime(cert: Certificate, elem: der.Element) ParseTimeError!u64 {
555 return error.CertificateTimeInvalid;555 return error.CertificateTimeInvalid;
556 return Date.toSeconds(.{556 return Date.toSeconds(.{
557 .year = try parseYear4(bytes[0..4]),557 .year = try parseYear4(bytes[0..4]),
558 .month = try parseTimeDigits(bytes[4..6].*, 1, 12),558 .month = try parseTimeDigits(bytes[4..6], 1, 12),
559 .day = try parseTimeDigits(bytes[6..8].*, 1, 31),559 .day = try parseTimeDigits(bytes[6..8], 1, 31),
560 .hour = try parseTimeDigits(bytes[8..10].*, 0, 23),560 .hour = try parseTimeDigits(bytes[8..10], 0, 23),
561 .minute = try parseTimeDigits(bytes[10..12].*, 0, 59),561 .minute = try parseTimeDigits(bytes[10..12], 0, 59),
562 .second = try parseTimeDigits(bytes[12..14].*, 0, 59),562 .second = try parseTimeDigits(bytes[12..14], 0, 59),
563 });563 });
564 },564 },
565 else => return error.CertificateFieldHasWrongDataType,565 else => return error.CertificateFieldHasWrongDataType,
...@@ -613,8 +613,8 @@ const Date = struct {...@@ -613,8 +613,8 @@ const Date = struct {
613 }613 }
614};614};
615615
616pub fn parseTimeDigits(nn_u8: @Vector(2, u8), min: u8, max: u8) !u8 {616pub fn parseTimeDigits(text: *const [2]u8, min: u8, max: u8) !u8 {
617 const nn: @Vector(2, u16) = .{ nn_u8[0], nn_u8[1] };617 const nn: @Vector(2, u16) = .{ text[0], text[1] };
618 const zero: @Vector(2, u16) = .{ '0', '0' };618 const zero: @Vector(2, u16) = .{ '0', '0' };
619 const mm: @Vector(2, u16) = .{ 10, 1 };619 const mm: @Vector(2, u16) = .{ 10, 1 };
620 const result = @reduce(.Add, (nn -% zero) *% mm);620 const result = @reduce(.Add, (nn -% zero) *% mm);
...@@ -625,14 +625,14 @@ pub fn parseTimeDigits(nn_u8: @Vector(2, u8), min: u8, max: u8) !u8 {...@@ -625,14 +625,14 @@ pub fn parseTimeDigits(nn_u8: @Vector(2, u8), min: u8, max: u8) !u8 {
625625
626test parseTimeDigits {626test parseTimeDigits {
627 const expectEqual = std.testing.expectEqual;627 const expectEqual = std.testing.expectEqual;
628 try expectEqual(@as(u8, 0), try parseTimeDigits("00".*, 0, 99));628 try expectEqual(@as(u8, 0), try parseTimeDigits("00", 0, 99));
629 try expectEqual(@as(u8, 99), try parseTimeDigits("99".*, 0, 99));629 try expectEqual(@as(u8, 99), try parseTimeDigits("99", 0, 99));
630 try expectEqual(@as(u8, 42), try parseTimeDigits("42".*, 0, 99));630 try expectEqual(@as(u8, 42), try parseTimeDigits("42", 0, 99));
631631
632 const expectError = std.testing.expectError;632 const expectError = std.testing.expectError;
633 try expectError(error.CertificateTimeInvalid, parseTimeDigits("13".*, 1, 12));633 try expectError(error.CertificateTimeInvalid, parseTimeDigits("13", 1, 12));
634 try expectError(error.CertificateTimeInvalid, parseTimeDigits("00".*, 1, 12));634 try expectError(error.CertificateTimeInvalid, parseTimeDigits("00", 1, 12));
635 try expectError(error.CertificateTimeInvalid, parseTimeDigits("Di".*, 0, 99));635 try expectError(error.CertificateTimeInvalid, parseTimeDigits("Di", 0, 99));
636}636}
637637
638pub fn parseYear4(text: *const [4]u8) !u16 {638pub fn parseYear4(text: *const [4]u8) !u16 {