Just FYI - I think that the whole problem can be avoided by merging this patch https://github.com/P-H-C/phc-winner-argon2/pull/331 (we have the patch applied in cryptsetup for embedded libargon already). Just upstream is no longer responding here... Milan