aboutsummaryrefslogtreecommitdiff
path: root/lib/std/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'lib/std/crypto')
-rw-r--r--lib/std/crypto/aes.zig38
-rw-r--r--lib/std/crypto/blake2.zig11
-rw-r--r--lib/std/crypto/chacha20.zig61
-rw-r--r--lib/std/crypto/md5.zig3
-rw-r--r--lib/std/crypto/poly1305.zig29
-rw-r--r--lib/std/crypto/sha1.zig3
-rw-r--r--lib/std/crypto/sha2.zig6
-rw-r--r--lib/std/crypto/sha3.zig5
-rw-r--r--lib/std/crypto/x25519.zig41
9 files changed, 93 insertions, 104 deletions
diff --git a/lib/std/crypto/aes.zig b/lib/std/crypto/aes.zig
index 1cc166f943..81dc56f0b3 100644
--- a/lib/std/crypto/aes.zig
+++ b/lib/std/crypto/aes.zig
@@ -15,10 +15,10 @@ fn rotw(w: u32) u32 {
// Encrypt one block from src into dst, using the expanded key xk.
fn encryptBlock(xk: []const u32, dst: []u8, src: []const u8) void {
- var s0 = mem.readIntSliceBig(u32, src[0..4]);
- var s1 = mem.readIntSliceBig(u32, src[4..8]);
- var s2 = mem.readIntSliceBig(u32, src[8..12]);
- var s3 = mem.readIntSliceBig(u32, src[12..16]);
+ var s0 = mem.readIntBig(u32, src[0..4]);
+ var s1 = mem.readIntBig(u32, src[4..8]);
+ var s2 = mem.readIntBig(u32, src[8..12]);
+ var s3 = mem.readIntBig(u32, src[12..16]);
// First round just XORs input with key.
s0 ^= xk[0];
@@ -58,18 +58,18 @@ fn encryptBlock(xk: []const u32, dst: []u8, src: []const u8) void {
s2 ^= xk[k + 2];
s3 ^= xk[k + 3];
- mem.writeIntSliceBig(u32, dst[0..4], s0);
- mem.writeIntSliceBig(u32, dst[4..8], s1);
- mem.writeIntSliceBig(u32, dst[8..12], s2);
- mem.writeIntSliceBig(u32, dst[12..16], s3);
+ mem.writeIntBig(u32, dst[0..4], s0);
+ mem.writeIntBig(u32, dst[4..8], s1);
+ mem.writeIntBig(u32, dst[8..12], s2);
+ mem.writeIntBig(u32, dst[12..16], s3);
}
// Decrypt one block from src into dst, using the expanded key xk.
pub fn decryptBlock(xk: []const u32, dst: []u8, src: []const u8) void {
- var s0 = mem.readIntSliceBig(u32, src[0..4]);
- var s1 = mem.readIntSliceBig(u32, src[4..8]);
- var s2 = mem.readIntSliceBig(u32, src[8..12]);
- var s3 = mem.readIntSliceBig(u32, src[12..16]);
+ var s0 = mem.readIntBig(u32, src[0..4]);
+ var s1 = mem.readIntBig(u32, src[4..8]);
+ var s2 = mem.readIntBig(u32, src[8..12]);
+ var s3 = mem.readIntBig(u32, src[12..16]);
// First round just XORs input with key.
s0 ^= xk[0];
@@ -109,10 +109,10 @@ pub fn decryptBlock(xk: []const u32, dst: []u8, src: []const u8) void {
s2 ^= xk[k + 2];
s3 ^= xk[k + 3];
- mem.writeIntSliceBig(u32, dst[0..4], s0);
- mem.writeIntSliceBig(u32, dst[4..8], s1);
- mem.writeIntSliceBig(u32, dst[8..12], s2);
- mem.writeIntSliceBig(u32, dst[12..16], s3);
+ mem.writeIntBig(u32, dst[0..4], s0);
+ mem.writeIntBig(u32, dst[4..8], s1);
+ mem.writeIntBig(u32, dst[8..12], s2);
+ mem.writeIntBig(u32, dst[12..16], s3);
}
fn xorBytes(dst: []u8, a: []const u8, b: []const u8) usize {
@@ -154,8 +154,8 @@ fn AES(comptime keysize: usize) type {
var n: usize = 0;
while (n < src.len) {
ctx.encrypt(keystream[0..], ctrbuf[0..]);
- var ctr_i = std.mem.readIntSliceBig(u128, ctrbuf[0..]);
- std.mem.writeIntSliceBig(u128, ctrbuf[0..], ctr_i +% 1);
+ var ctr_i = std.mem.readIntBig(u128, ctrbuf[0..]);
+ std.mem.writeIntBig(u128, ctrbuf[0..], ctr_i +% 1);
n += xorBytes(dst[n..], src[n..], &keystream);
}
@@ -251,7 +251,7 @@ fn expandKey(key: []const u8, enc: []u32, dec: []u32) void {
var i: usize = 0;
var nk = key.len / 4;
while (i < nk) : (i += 1) {
- enc[i] = mem.readIntSliceBig(u32, key[4 * i .. 4 * i + 4]);
+ enc[i] = mem.readIntBig(u32, key[4 * i ..][0..4]);
}
while (i < enc.len) : (i += 1) {
var t = enc[i - 1];
diff --git a/lib/std/crypto/blake2.zig b/lib/std/crypto/blake2.zig
index e03d8f7dab..fc1d59290e 100644
--- a/lib/std/crypto/blake2.zig
+++ b/lib/std/crypto/blake2.zig
@@ -123,8 +123,7 @@ fn Blake2s(comptime out_len: usize) type {
const rr = d.h[0 .. out_len / 32];
for (rr) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceLittle(u32, out[4 * j .. 4 * j + 4], s);
+ mem.writeIntLittle(u32, out[4 * j ..][0..4], s);
}
}
@@ -135,8 +134,7 @@ fn Blake2s(comptime out_len: usize) type {
var v: [16]u32 = undefined;
for (m) |*r, i| {
- // TODO https://github.com/ziglang/zig/issues/863
- r.* = mem.readIntSliceLittle(u32, b[4 * i .. 4 * i + 4]);
+ r.* = mem.readIntLittle(u32, b[4 * i ..][0..4]);
}
var k: usize = 0;
@@ -358,8 +356,7 @@ fn Blake2b(comptime out_len: usize) type {
const rr = d.h[0 .. out_len / 64];
for (rr) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceLittle(u64, out[8 * j .. 8 * j + 8], s);
+ mem.writeIntLittle(u64, out[8 * j ..][0..8], s);
}
}
@@ -370,7 +367,7 @@ fn Blake2b(comptime out_len: usize) type {
var v: [16]u64 = undefined;
for (m) |*r, i| {
- r.* = mem.readIntSliceLittle(u64, b[8 * i .. 8 * i + 8]);
+ r.* = mem.readIntLittle(u64, b[8 * i ..][0..8]);
}
var k: usize = 0;
diff --git a/lib/std/crypto/chacha20.zig b/lib/std/crypto/chacha20.zig
index d67877b051..f6008745af 100644
--- a/lib/std/crypto/chacha20.zig
+++ b/lib/std/crypto/chacha20.zig
@@ -61,8 +61,7 @@ fn salsa20_wordtobyte(out: []u8, input: [16]u32) void {
}
for (x) |_, i| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceLittle(u32, out[4 * i .. 4 * i + 4], x[i] +% input[i]);
+ mem.writeIntLittle(u32, out[4 * i ..][0..4], x[i] +% input[i]);
}
}
@@ -73,10 +72,10 @@ fn chaCha20_internal(out: []u8, in: []const u8, key: [8]u32, counter: [4]u32) vo
const c = "expand 32-byte k";
const constant_le = [_]u32{
- mem.readIntSliceLittle(u32, c[0..4]),
- mem.readIntSliceLittle(u32, c[4..8]),
- mem.readIntSliceLittle(u32, c[8..12]),
- mem.readIntSliceLittle(u32, c[12..16]),
+ mem.readIntLittle(u32, c[0..4]),
+ mem.readIntLittle(u32, c[4..8]),
+ mem.readIntLittle(u32, c[8..12]),
+ mem.readIntLittle(u32, c[12..16]),
};
mem.copy(u32, ctx[0..], constant_le[0..4]);
@@ -120,19 +119,19 @@ pub fn chaCha20IETF(out: []u8, in: []const u8, counter: u32, key: [32]u8, nonce:
var k: [8]u32 = undefined;
var c: [4]u32 = undefined;
- k[0] = mem.readIntSliceLittle(u32, key[0..4]);
- k[1] = mem.readIntSliceLittle(u32, key[4..8]);
- k[2] = mem.readIntSliceLittle(u32, key[8..12]);
- k[3] = mem.readIntSliceLittle(u32, key[12..16]);
- k[4] = mem.readIntSliceLittle(u32, key[16..20]);
- k[5] = mem.readIntSliceLittle(u32, key[20..24]);
- k[6] = mem.readIntSliceLittle(u32, key[24..28]);
- k[7] = mem.readIntSliceLittle(u32, key[28..32]);
+ k[0] = mem.readIntLittle(u32, key[0..4]);
+ k[1] = mem.readIntLittle(u32, key[4..8]);
+ k[2] = mem.readIntLittle(u32, key[8..12]);
+ k[3] = mem.readIntLittle(u32, key[12..16]);
+ k[4] = mem.readIntLittle(u32, key[16..20]);
+ k[5] = mem.readIntLittle(u32, key[20..24]);
+ k[6] = mem.readIntLittle(u32, key[24..28]);
+ k[7] = mem.readIntLittle(u32, key[28..32]);
c[0] = counter;
- c[1] = mem.readIntSliceLittle(u32, nonce[0..4]);
- c[2] = mem.readIntSliceLittle(u32, nonce[4..8]);
- c[3] = mem.readIntSliceLittle(u32, nonce[8..12]);
+ c[1] = mem.readIntLittle(u32, nonce[0..4]);
+ c[2] = mem.readIntLittle(u32, nonce[4..8]);
+ c[3] = mem.readIntLittle(u32, nonce[8..12]);
chaCha20_internal(out, in, k, c);
}
@@ -147,19 +146,19 @@ pub fn chaCha20With64BitNonce(out: []u8, in: []const u8, counter: u64, key: [32]
var k: [8]u32 = undefined;
var c: [4]u32 = undefined;
- k[0] = mem.readIntSliceLittle(u32, key[0..4]);
- k[1] = mem.readIntSliceLittle(u32, key[4..8]);
- k[2] = mem.readIntSliceLittle(u32, key[8..12]);
- k[3] = mem.readIntSliceLittle(u32, key[12..16]);
- k[4] = mem.readIntSliceLittle(u32, key[16..20]);
- k[5] = mem.readIntSliceLittle(u32, key[20..24]);
- k[6] = mem.readIntSliceLittle(u32, key[24..28]);
- k[7] = mem.readIntSliceLittle(u32, key[28..32]);
+ k[0] = mem.readIntLittle(u32, key[0..4]);
+ k[1] = mem.readIntLittle(u32, key[4..8]);
+ k[2] = mem.readIntLittle(u32, key[8..12]);
+ k[3] = mem.readIntLittle(u32, key[12..16]);
+ k[4] = mem.readIntLittle(u32, key[16..20]);
+ k[5] = mem.readIntLittle(u32, key[20..24]);
+ k[6] = mem.readIntLittle(u32, key[24..28]);
+ k[7] = mem.readIntLittle(u32, key[28..32]);
c[0] = @truncate(u32, counter);
c[1] = @truncate(u32, counter >> 32);
- c[2] = mem.readIntSliceLittle(u32, nonce[0..4]);
- c[3] = mem.readIntSliceLittle(u32, nonce[4..8]);
+ c[2] = mem.readIntLittle(u32, nonce[0..4]);
+ c[3] = mem.readIntLittle(u32, nonce[4..8]);
const block_size = (1 << 6);
// The full block size is greater than the address space on a 32bit machine
@@ -463,8 +462,8 @@ pub fn chacha20poly1305Seal(dst: []u8, plaintext: []const u8, data: []const u8,
mac.update(zeros[0..padding]);
}
var lens: [16]u8 = undefined;
- mem.writeIntSliceLittle(u64, lens[0..8], data.len);
- mem.writeIntSliceLittle(u64, lens[8..16], plaintext.len);
+ mem.writeIntLittle(u64, lens[0..8], data.len);
+ mem.writeIntLittle(u64, lens[8..16], plaintext.len);
mac.update(lens[0..]);
mac.final(dst[plaintext.len..]);
}
@@ -500,8 +499,8 @@ pub fn chacha20poly1305Open(dst: []u8, msgAndTag: []const u8, data: []const u8,
mac.update(zeros[0..padding]);
}
var lens: [16]u8 = undefined;
- mem.writeIntSliceLittle(u64, lens[0..8], data.len);
- mem.writeIntSliceLittle(u64, lens[8..16], ciphertext.len);
+ mem.writeIntLittle(u64, lens[0..8], data.len);
+ mem.writeIntLittle(u64, lens[8..16], ciphertext.len);
mac.update(lens[0..]);
var computedTag: [16]u8 = undefined;
mac.final(computedTag[0..]);
diff --git a/lib/std/crypto/md5.zig b/lib/std/crypto/md5.zig
index d9dd08c904..ac8948ca20 100644
--- a/lib/std/crypto/md5.zig
+++ b/lib/std/crypto/md5.zig
@@ -112,8 +112,7 @@ pub const Md5 = struct {
d.round(d.buf[0..]);
for (d.s) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceLittle(u32, out[4 * j .. 4 * j + 4], s);
+ mem.writeIntLittle(u32, out[4 * j ..][0..4], s);
}
}
diff --git a/lib/std/crypto/poly1305.zig b/lib/std/crypto/poly1305.zig
index 2395b1c7aa..fda978307d 100644
--- a/lib/std/crypto/poly1305.zig
+++ b/lib/std/crypto/poly1305.zig
@@ -3,11 +3,11 @@
// https://monocypher.org/
const std = @import("../std.zig");
-const builtin = @import("builtin");
+const builtin = std.builtin;
const Endian = builtin.Endian;
-const readIntSliceLittle = std.mem.readIntSliceLittle;
-const writeIntSliceLittle = std.mem.writeIntSliceLittle;
+const readIntLittle = std.mem.readIntLittle;
+const writeIntLittle = std.mem.writeIntLittle;
pub const Poly1305 = struct {
const Self = @This();
@@ -59,19 +59,19 @@ pub const Poly1305 = struct {
{
var i: usize = 0;
while (i < 1) : (i += 1) {
- ctx.r[0] = readIntSliceLittle(u32, key[0..4]) & 0x0fffffff;
+ ctx.r[0] = readIntLittle(u32, key[0..4]) & 0x0fffffff;
}
}
{
var i: usize = 1;
while (i < 4) : (i += 1) {
- ctx.r[i] = readIntSliceLittle(u32, key[i * 4 .. i * 4 + 4]) & 0x0ffffffc;
+ ctx.r[i] = readIntLittle(u32, key[i * 4 ..][0..4]) & 0x0ffffffc;
}
}
{
var i: usize = 0;
while (i < 4) : (i += 1) {
- ctx.pad[i] = readIntSliceLittle(u32, key[i * 4 + 16 .. i * 4 + 16 + 4]);
+ ctx.pad[i] = readIntLittle(u32, key[i * 4 + 16 ..][0..4]);
}
}
@@ -168,10 +168,10 @@ pub const Poly1305 = struct {
const nb_blocks = nmsg.len >> 4;
var i: usize = 0;
while (i < nb_blocks) : (i += 1) {
- ctx.c[0] = readIntSliceLittle(u32, nmsg[0..4]);
- ctx.c[1] = readIntSliceLittle(u32, nmsg[4..8]);
- ctx.c[2] = readIntSliceLittle(u32, nmsg[8..12]);
- ctx.c[3] = readIntSliceLittle(u32, nmsg[12..16]);
+ ctx.c[0] = readIntLittle(u32, nmsg[0..4]);
+ ctx.c[1] = readIntLittle(u32, nmsg[4..8]);
+ ctx.c[2] = readIntLittle(u32, nmsg[8..12]);
+ ctx.c[3] = readIntLittle(u32, nmsg[12..16]);
polyBlock(ctx);
nmsg = nmsg[16..];
}
@@ -210,11 +210,10 @@ pub const Poly1305 = struct {
const uu2 = (uu1 >> 32) + ctx.h[2] + ctx.pad[2]; // <= 2_00000000
const uu3 = (uu2 >> 32) + ctx.h[3] + ctx.pad[3]; // <= 2_00000000
- // TODO https://github.com/ziglang/zig/issues/863
- writeIntSliceLittle(u32, out[0..], @truncate(u32, uu0));
- writeIntSliceLittle(u32, out[4..], @truncate(u32, uu1));
- writeIntSliceLittle(u32, out[8..], @truncate(u32, uu2));
- writeIntSliceLittle(u32, out[12..], @truncate(u32, uu3));
+ writeIntLittle(u32, out[0..4], @truncate(u32, uu0));
+ writeIntLittle(u32, out[4..8], @truncate(u32, uu1));
+ writeIntLittle(u32, out[8..12], @truncate(u32, uu2));
+ writeIntLittle(u32, out[12..16], @truncate(u32, uu3));
ctx.secureZero();
}
diff --git a/lib/std/crypto/sha1.zig b/lib/std/crypto/sha1.zig
index 5be42180a1..6edf7b745e 100644
--- a/lib/std/crypto/sha1.zig
+++ b/lib/std/crypto/sha1.zig
@@ -109,8 +109,7 @@ pub const Sha1 = struct {
d.round(d.buf[0..]);
for (d.s) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceBig(u32, out[4 * j .. 4 * j + 4], s);
+ mem.writeIntBig(u32, out[4 * j ..][0..4], s);
}
}
diff --git a/lib/std/crypto/sha2.zig b/lib/std/crypto/sha2.zig
index fd7ad532a3..f004bceac3 100644
--- a/lib/std/crypto/sha2.zig
+++ b/lib/std/crypto/sha2.zig
@@ -167,8 +167,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
const rr = d.s[0 .. params.out_len / 32];
for (rr) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceBig(u32, out[4 * j .. 4 * j + 4], s);
+ mem.writeIntBig(u32, out[4 * j ..][0..4], s);
}
}
@@ -509,8 +508,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
const rr = d.s[0 .. params.out_len / 64];
for (rr) |s, j| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceBig(u64, out[8 * j .. 8 * j + 8], s);
+ mem.writeIntBig(u64, out[8 * j ..][0..8], s);
}
}
diff --git a/lib/std/crypto/sha3.zig b/lib/std/crypto/sha3.zig
index d7b2fbe256..7c60674d75 100644
--- a/lib/std/crypto/sha3.zig
+++ b/lib/std/crypto/sha3.zig
@@ -120,7 +120,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {
var c = [_]u64{0} ** 5;
for (s) |*r, i| {
- r.* = mem.readIntSliceLittle(u64, d[8 * i .. 8 * i + 8]);
+ r.* = mem.readIntLittle(u64, d[8 * i ..][0..8]);
}
comptime var x: usize = 0;
@@ -167,8 +167,7 @@ fn keccak_f(comptime F: usize, d: []u8) void {
}
for (s) |r, i| {
- // TODO https://github.com/ziglang/zig/issues/863
- mem.writeIntSliceLittle(u64, d[8 * i .. 8 * i + 8], r);
+ mem.writeIntLittle(u64, d[8 * i ..][0..8], r);
}
}
diff --git a/lib/std/crypto/x25519.zig b/lib/std/crypto/x25519.zig
index 16e3f073f8..e2e2bf90e5 100644
--- a/lib/std/crypto/x25519.zig
+++ b/lib/std/crypto/x25519.zig
@@ -7,8 +7,8 @@ const builtin = @import("builtin");
const fmt = std.fmt;
const Endian = builtin.Endian;
-const readIntSliceLittle = std.mem.readIntSliceLittle;
-const writeIntSliceLittle = std.mem.writeIntSliceLittle;
+const readIntLittle = std.mem.readIntLittle;
+const writeIntLittle = std.mem.writeIntLittle;
// Based on Supercop's ref10 implementation.
pub const X25519 = struct {
@@ -255,16 +255,16 @@ const Fe = struct {
var t: [10]i64 = undefined;
- t[0] = readIntSliceLittle(u32, s[0..4]);
- t[1] = @as(u32, readIntSliceLittle(u24, s[4..7])) << 6;
- t[2] = @as(u32, readIntSliceLittle(u24, s[7..10])) << 5;
- t[3] = @as(u32, readIntSliceLittle(u24, s[10..13])) << 3;
- t[4] = @as(u32, readIntSliceLittle(u24, s[13..16])) << 2;
- t[5] = readIntSliceLittle(u32, s[16..20]);
- t[6] = @as(u32, readIntSliceLittle(u24, s[20..23])) << 7;
- t[7] = @as(u32, readIntSliceLittle(u24, s[23..26])) << 5;
- t[8] = @as(u32, readIntSliceLittle(u24, s[26..29])) << 4;
- t[9] = (@as(u32, readIntSliceLittle(u24, s[29..32])) & 0x7fffff) << 2;
+ t[0] = readIntLittle(u32, s[0..4]);
+ t[1] = @as(u32, readIntLittle(u24, s[4..7])) << 6;
+ t[2] = @as(u32, readIntLittle(u24, s[7..10])) << 5;
+ t[3] = @as(u32, readIntLittle(u24, s[10..13])) << 3;
+ t[4] = @as(u32, readIntLittle(u24, s[13..16])) << 2;
+ t[5] = readIntLittle(u32, s[16..20]);
+ t[6] = @as(u32, readIntLittle(u24, s[20..23])) << 7;
+ t[7] = @as(u32, readIntLittle(u24, s[23..26])) << 5;
+ t[8] = @as(u32, readIntLittle(u24, s[26..29])) << 4;
+ t[9] = (@as(u32, readIntLittle(u24, s[29..32])) & 0x7fffff) << 2;
carry1(h, t[0..]);
}
@@ -544,15 +544,14 @@ const Fe = struct {
ut[i] = @bitCast(u32, @intCast(i32, t[i]));
}
- // TODO https://github.com/ziglang/zig/issues/863
- writeIntSliceLittle(u32, s[0..4], (ut[0] >> 0) | (ut[1] << 26));
- writeIntSliceLittle(u32, s[4..8], (ut[1] >> 6) | (ut[2] << 19));
- writeIntSliceLittle(u32, s[8..12], (ut[2] >> 13) | (ut[3] << 13));
- writeIntSliceLittle(u32, s[12..16], (ut[3] >> 19) | (ut[4] << 6));
- writeIntSliceLittle(u32, s[16..20], (ut[5] >> 0) | (ut[6] << 25));
- writeIntSliceLittle(u32, s[20..24], (ut[6] >> 7) | (ut[7] << 19));
- writeIntSliceLittle(u32, s[24..28], (ut[7] >> 13) | (ut[8] << 12));
- writeIntSliceLittle(u32, s[28..], (ut[8] >> 20) | (ut[9] << 6));
+ writeIntLittle(u32, s[0..4], (ut[0] >> 0) | (ut[1] << 26));
+ writeIntLittle(u32, s[4..8], (ut[1] >> 6) | (ut[2] << 19));
+ writeIntLittle(u32, s[8..12], (ut[2] >> 13) | (ut[3] << 13));
+ writeIntLittle(u32, s[12..16], (ut[3] >> 19) | (ut[4] << 6));
+ writeIntLittle(u32, s[16..20], (ut[5] >> 0) | (ut[6] << 25));
+ writeIntLittle(u32, s[20..24], (ut[6] >> 7) | (ut[7] << 19));
+ writeIntLittle(u32, s[24..28], (ut[7] >> 13) | (ut[8] << 12));
+ writeIntLittle(u32, s[28..32], (ut[8] >> 20) | (ut[9] << 6));
std.mem.secureZero(i64, t[0..]);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 00:35:14 +0000