# Merge pull request \#6336 from Rocknest/pbkdf2 · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/f125288c9be6e528906e34bacc51baae2586faf4)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: f125288c9be6e528906e34bacc51baae2586faf4

Requested commit: f125288c9be6e528906e34bacc51baae2586faf4

Commit: f125288c9be6e528906e34bacc51baae2586faf4

Tree: 263d469e8b370b9eb13ffe4a46dcc8e9906928ab

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #6336 from Rocknest/pbkdf2

Some changes to #6326 (pbkdf2)
```

## Parents

- [5e3fa0e94f947c632aa584b9e13bfa2fe241fae1](https://git.cafe/gitcafe/zig/commit/5e3fa0e94f947c632aa584b9e13bfa2fe241fae1?format=markdown)

- [c35703825f17bb2b1108a371bb0559b89ff2b2a0](https://git.cafe/gitcafe/zig/commit/c35703825f17bb2b1108a371bb0559b89ff2b2a0?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/f125288c9be6e528906e34bacc51baae2586faf4?format=markdown)