fixed

Author: deatil

README.md

@@ -5,7 +5,7 @@ A JWT (JSON Web Token) library for zig.
 
 ### Env
 
- - Zig >= 0.15.1
+ - Zig >= 0.16.0-dev.164+bc7955306.
 
 
 ### What the heck is a JWT?

build.zig.zon

@@ -1,7 +1,7 @@
 .{
     .name = .zig_jwt,
     .description = "A JWT (JSON Web Token) library for zig.",
-    .version = "1.3.1",
+    .version = "1.3.2",
     .fingerprint = 0x30a5aec248bd7ac3,
     .minimum_zig_version = "0.15.1",
     .dependencies = .{},

src/ecdsa.zig

@@ -184,10 +184,10 @@ pub fn ParseKeyDer(comptime EC: type, comptime CheckOidFn: type) type {
 
 fn checkECDSAPublickeyOid(oid: []const u8) !void {
     var buf: [256]u8 = undefined;
-    var stream = std.Io.fixedBufferStream(&buf);
-    try oids.decode(oid, stream.writer());
+    var stream: std.Io.Writer = .fixed(&buf);
+    try oids.decode(oid, &stream);
 
-    const oid_string = stream.getWritten();
+    const oid_string = stream.written();
     if (!std.mem.eql(u8, oid_string, oid_ecdsa_publickey)) {
         return error.JWTEcdsaOidError;
     }
@@ -197,10 +197,10 @@ fn checkECDSAPublickeyOid(oid: []const u8) !void {
 
 fn checkECDSAPublickeyNamedCurveOid(oid: []const u8, namedcurve_oid: []const u8) !void {
     var buf: [256]u8 = undefined;
-    var stream = std.Io.fixedBufferStream(&buf);
-    try oids.decode(oid, stream.writer());
+    var stream: std.Io.Writer = .fixed(&buf);
+    try oids.decode(oid, &stream);
 
-    const oid_string = stream.getWritten();
+    const oid_string = stream.written();
     if (!std.mem.eql(u8, oid_string, namedcurve_oid)) {
         return error.JWTEcdsaNamedCurveNotSupport;
     }

src/eddsa.zig

@@ -123,10 +123,10 @@ pub fn parsePublicKeyDer(bytes: []const u8) !Ed25519.PublicKey {
 
 fn checkEdDSAPublickeyOid(oid: []const u8) !void {
     var buf: [256]u8 = undefined;
-    var stream = std.Io.fixedBufferStream(&buf);
-    try oids.decode(oid, stream.writer());
+    var stream: std.Io.Writer = .fixed(&buf);
+    try oids.decode(oid, &stream);
 
-    const oid_string = stream.getWritten();
+    const oid_string = stream.written();
     if (!std.mem.eql(u8, oid_string, oid_eddsa_publickey)) {
         return error.JWTEdDSAOidError;
     }

src/rsa/der.zig

@@ -96,9 +96,9 @@ pub const Parser = struct {
         return Enum.oids.get(oid) orelse {
             if (builtin.mode == .Debug) {
                 var buf: [256]u8 = undefined;
-                var stream = std.Io.fixedBufferStream(&buf);
-                try @import("./oid.zig").decode(oid, stream.writer());
-                log.warn("unknown oid {s} for enum {s}\n", .{ stream.getWritten(), @typeName(Enum) });
+                var stream: std.Io.Writer = .fixed(&buf);
+                try @import("./oid.zig").decode(oid, &stream);
+                log.warn("unknown oid {s} for enum {s}\n", .{ stream.written(), @typeName(Enum) });
             }
             return error.UnknownObjectId;
         };
@@ -223,11 +223,10 @@ pub const Element = struct {
     };
 
     pub fn init(bytes: []const u8, index: Index) !Element {
-        var stream = std.Io.fixedBufferStream(bytes[index..]);
-        var reader = stream.reader();
+        var reader = std.Io.Reader.fixed(bytes[index..]);
 
-        const identifier = @as(Identifier, @bitCast(try reader.readByte()));
-        const size_or_len_size = try reader.readByte();
+        const identifier = @as(Identifier, @bitCast(try reader.takeByte()));
+        const size_or_len_size = try reader.takeByte();
 
         var start = index + 2;
         // short form between 0-127
@@ -242,7 +241,7 @@ pub const Element = struct {
         const len_size: u7 = @truncate(size_or_len_size);
         start += len_size;
         if (len_size > @sizeOf(Index)) return error.InvalidLength;
-        const len = try reader.readVarInt(Index, .big, len_size);
+        const len = try reader.takeVarInt(Index, .big, len_size);
         if (len < 128) return error.InvalidLength; // should have used short form
 
         const end = std.math.add(Index, start, len) catch return error.InvalidLength;

src/rsa/oid.zig

@@ -61,7 +61,7 @@ pub fn encode(dot_notation: []const u8, buf: []u8) EncodeError![]const u8 {
     return buf[0..i];
 }
 
-pub fn decode(encoded: []const u8, writer: anytype) @TypeOf(writer).Error!void {
+pub fn decode(encoded: []const u8, writer: anytype) !void {
     const first = @divTrunc(encoded[0], 40);
     const second = encoded[0] - first * 40;
     try writer.print("{d}.{d}", .{ first, second });
@@ -102,9 +102,9 @@ fn testOid(expected_encoded: []const u8, expected_dot_notation: []const u8) !voi
     const encoded = try encode(expected_dot_notation, &buf);
     try std.testing.expectEqualSlices(u8, expected_encoded, encoded);
 
-    var stream = std.Io.fixedBufferStream(&buf);
-    try decode(expected_encoded, stream.writer());
-    try std.testing.expectEqualStrings(expected_dot_notation, stream.getWritten());
+    var stream: std.Io.Writer = .fixed(&buf);
+    try decode(expected_encoded, &stream);
+    try std.testing.expectEqualStrings(expected_dot_notation, stream.written());
 }
 
 test "encode and decode" {

src/rsa/rsa.zig

@@ -460,10 +460,10 @@ pub const CRTValue = struct {
 
 fn checkRSAPublickeyOid(oid: []const u8) !void {
     var buf: [256]u8 = undefined;
-    var stream = std.Io.fixedBufferStream(&buf);
-    try oids.decode(oid, stream.writer());
+    var stream: std.Io.Writer = .fixed(&buf);
+    try oids.decode(oid, &stream);
 
-    const oid_string = stream.getWritten();
+    const oid_string = stream.written();
     if (!std.mem.eql(u8, oid_string, oid_rsa_publickey)) {
         return error.RSAOidError;
     }