Skip to content

Use pointers #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ptoffy wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Use pointers #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33dc787
Use pointers
ptoffy Dec 17, 2025
f70e3c6
Adjust
ptoffy Dec 17, 2025
db36820
Merge branch 'main' into pointers
ptoffy Dec 17, 2025
65d0e37
Merge branch 'main' into pointers
ptoffy Dec 17, 2025
955ff51
Merge branch 'main' into pointers
ptoffy Dec 17, 2025
263d221
Update measurements
ptoffy Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Currently these are the benchmarks for hashing the password "password" with cost
| | Release ms | Debug ms | Allocations Release | Allocations Debug |
|------|------------|----------|---------------------|-------------------|
| vapor/authentication | 215ms | 337ms | ~13,700 | ~13,800 |
| swift-bcrypt | 195ms | 453ms | ~13,400 | ~13,500 |
| swift-bcrypt | 212ms | 454ms | ~13,400 | ~13,400 |


138 changes: 74 additions & 64 deletions Sources/Bcrypt/EksBlowfish.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,40 +46,43 @@

return word
}

@usableFromInline
static func expand0State(key: [UInt8], p: inout [UInt32], s: inout [UInt32]) {
var j = 0
var i = 0
while i < Self.N &+ 2 {
p[i] ^= stream2word(data: key, j: &j)
i &+= 1
}

var dataL: UInt32 = 0
var dataR: UInt32 = 0

i = 0
j = 0
while i < Self.N &+ 2 {
encipher(xl: &dataL, xr: &dataR, p: p, s: s)

p[i] = dataL
p[i &+ 1] = dataR
i &+= 2
}

i = 0
while i < 4 {
var k = 0
while k < 256 {
encipher(xl: &dataL, xr: &dataR, p: p, s: s)

s[i &* 0x100 &+ k] = dataL
s[i &* 0x100 &+ (k &+ 1)] = dataR
k &+= 2
p.withUnsafeMutableBufferPointer { pBuf in
s.withUnsafeMutableBufferPointer { sBuf in
let pPtr = pBuf.baseAddress!
let sPtr = sBuf.baseAddress!

var j = 0
var i = 0
while i < Self.N &+ 2 {
pPtr[i] ^= stream2word(data: key, j: &j)
i &+= 1
}

var dataL: UInt32 = 0
var dataR: UInt32 = 0

i = 0
while i < Self.N &+ 2 {
encipher(xl: &dataL, xr: &dataR, p: pPtr, s: sPtr)
pPtr[i] = dataL
pPtr[i &+ 1] = dataR
i &+= 2
}

i = 0
while i < 4 {
var k = 0
while k < 256 {
encipher(xl: &dataL, xr: &dataR, p: pPtr, s: sPtr)
sPtr[i &* 0x100 &+ k] = dataL
sPtr[i &* 0x100 &+ (k &+ 1)] = dataR
k &+= 2
}
i &+= 1
}
}
i &+= 1
}
}

Expand All @@ -90,41 +93,48 @@
p: inout [UInt32],
s: inout [UInt32]
) {
var j = 0
var i = 0
while i < Self.N &+ 2 {
p[i] ^= stream2word(data: password, j: &j)
i &+= 1
}

j = 0
i = 0
var dataL: UInt32 = 0
var dataR: UInt32 = 0

while i < Self.N &+ 2 {
dataL ^= stream2word(data: salt, j: &j)
dataR ^= stream2word(data: salt, j: &j)
encipher(xl: &dataL, xr: &dataR, p: p, s: s)
p.withUnsafeMutableBufferPointer { pBuf in
s.withUnsafeMutableBufferPointer { sBuf in
let pPtr = pBuf.baseAddress!
let sPtr = sBuf.baseAddress!

var j = 0
var i = 0
while i < Self.N &+ 2 {
pPtr[i] ^= stream2word(data: password, j: &j)
i &+= 1
}

p[i] = dataL
p[i &+ 1] = dataR
i &+= 2
}

i = 0
while i < 4 {
var k = 0
while k < 256 {
dataL ^= stream2word(data: salt, j: &j)
dataR ^= stream2word(data: salt, j: &j)
encipher(xl: &dataL, xr: &dataR, p: p, s: s)

s[i &* 0x100 &+ k] = dataL
s[i &* 0x100 &+ (k &+ 1)] = dataR
k &+= 2
j = 0
i = 0
var dataL: UInt32 = 0
var dataR: UInt32 = 0

while i < Self.N &+ 2 {
dataL ^= stream2word(data: salt, j: &j)
dataR ^= stream2word(data: salt, j: &j)
encipher(xl: &dataL, xr: &dataR, p: pPtr, s: sPtr)

pPtr[i] = dataL
pPtr[i &+ 1] = dataR
i &+= 2
}

i = 0
while i < 4 {
var k = 0
while k < 256 {
dataL ^= stream2word(data: salt, j: &j)
dataR ^= stream2word(data: salt, j: &j)
encipher(xl: &dataL, xr: &dataR, p: pPtr, s: sPtr)

sPtr[i &* 0x100 &+ k] = dataL
sPtr[i &* 0x100 &+ (k &+ 1)] = dataR
k &+= 2
}
i &+= 1
}
}
i &+= 1
}
}

Expand Down
39 changes: 23 additions & 16 deletions Sources/Bcrypt/Hasher.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,27 @@ extension Bcrypt {
i &+= 1
}

i = 0
while i < 64 {
var j = 0
var xl: UInt32 = 0
var xr: UInt32 = 0
while j < Self.words / 2 {
xl = cData[j &* 2]
xr = cData[j &* 2 &+ 1]
EksBlowfish.encipher(xl: &xl, xr: &xr, p: p, s: s)
cData[j &* 2] = xl
cData[j &* 2 &+ 1] = xr
j &+= 1
p.withUnsafeBufferPointer { pBuf in
s.withUnsafeBufferPointer { sBuf in
let pPtr = pBuf.baseAddress!
let sPtr = sBuf.baseAddress!

i = 0
while i < 64 {
var j = 0
var xl: UInt32 = 0
var xr: UInt32 = 0
while j < Self.words / 2 {
xl = cData[j &* 2]
xr = cData[j &* 2 &+ 1]
EksBlowfish.encipher(xl: &xl, xr: &xr, p: pPtr, s: sPtr)
cData[j &* 2] = xl
cData[j &* 2 &+ 1] = xr
j &+= 1
}
i &+= 1
}
}
i &+= 1
}

var cipherText = Self.cipherText
Expand All @@ -114,16 +121,16 @@ extension Bcrypt {
let cost: [UInt8] =
switch cost {
case 0...9:
[0x30, UInt8(cost + 0x30)]
[0x30, UInt8(cost &+ 0x30)]
default:
[UInt8(cost / 10 + 0x30), UInt8(cost % 10 + 0x30)]
[UInt8(cost / 10 &+ 0x30), UInt8(cost % 10 &+ 0x30)]
}

let prefix = version.identifier + cost + [36]

output += prefix
output += salt
output += Base64.encode(cipherText, count: 4 * Self.words - 1)
output += Base64.encode(cipherText, count: 4 &* Self.words &- 1)

return output
}
Expand Down
2 changes: 0 additions & 2 deletions Tests/BcryptTests/BcryptTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,8 @@ struct BcryptTests {
let hash1 = try Bcrypt.hash(password: password, cost: 6)
let hash2 = try Bcrypt.hash(password: password, cost: 6)

// Different salts should produce different hashes
#expect(hash1 != hash2)

// But both should verify
#expect(try Bcrypt.verify(password: password, hash: hash1))
#expect(try Bcrypt.verify(password: password, hash: hash2))
}
Expand Down