commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r891687 [5/12] - in /websites/production/commons/content/proper/commons-codec: ./ apidocs/ apidocs/org/apache/commons/codec/ apidocs/org/apache/commons/codec/binary/ apidocs/org/apache/commons/codec/binary/class-use/ apidocs/org/apache/comm...
Date Tue, 24 Dec 2013 20:40:32 GMT
Modified: websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Sha2Crypt.html
==============================================================================
--- websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Sha2Crypt.html (original)
+++ websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Sha2Crypt.html Tue Dec 24 20:40:26 2013
@@ -42,8 +42,8 @@
 <span class="sourceLineNo">034</span> * into the Public Domain.<a name="line.34"></a>
 <span class="sourceLineNo">035</span> * &lt;p&gt;<a name="line.35"></a>
 <span class="sourceLineNo">036</span> * This class is immutable and thread-safe.<a name="line.36"></a>
-<span class="sourceLineNo">037</span> *<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * @version $Id: Sha2Crypt.java 1435550 2013-01-19 14:09:52Z tn $<a name="line.38"></a>
+<span class="sourceLineNo">037</span> * <a name="line.37"></a>
+<span class="sourceLineNo">038</span> * @version $Id: Sha2Crypt.java 1552696 2013-12-20 15:01:34Z ggregory $<a name="line.38"></a>
 <span class="sourceLineNo">039</span> * @since 1.7<a name="line.39"></a>
 <span class="sourceLineNo">040</span> */<a name="line.40"></a>
 <span class="sourceLineNo">041</span>public class Sha2Crypt {<a name="line.41"></a>
@@ -80,461 +80,477 @@
 <span class="sourceLineNo">072</span>     * Generates a libc crypt() compatible "$5$" hash value with random salt.<a name="line.72"></a>
 <span class="sourceLineNo">073</span>     * &lt;p&gt;<a name="line.73"></a>
 <span class="sourceLineNo">074</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.74"></a>
-<span class="sourceLineNo">075</span>     *<a name="line.75"></a>
-<span class="sourceLineNo">076</span>     * @throws RuntimeException<a name="line.76"></a>
-<span class="sourceLineNo">077</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.77"></a>
-<span class="sourceLineNo">078</span>     */<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    public static String sha256Crypt(final byte[] keyBytes) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        return sha256Crypt(keyBytes, null);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>    /**<a name="line.83"></a>
-<span class="sourceLineNo">084</span>     * Generates a libc6 crypt() compatible "$5$" hash value.<a name="line.84"></a>
-<span class="sourceLineNo">085</span>     * &lt;p&gt;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.86"></a>
-<span class="sourceLineNo">087</span>     *<a name="line.87"></a>
-<span class="sourceLineNo">088</span>     * @throws IllegalArgumentException<a name="line.88"></a>
-<span class="sourceLineNo">089</span>     *             if the salt does not match the allowed pattern<a name="line.89"></a>
-<span class="sourceLineNo">090</span>     * @throws RuntimeException<a name="line.90"></a>
-<span class="sourceLineNo">091</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>     */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    public static String sha256Crypt(final byte[] keyBytes, String salt) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        if (salt == null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>            salt = SHA256_PREFIX + B64.getRandomSalt(8);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithms.SHA_256);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    /**<a name="line.100"></a>
-<span class="sourceLineNo">101</span>     * Generates a libc6 crypt() compatible "$5$" or "$6$" SHA2 based hash value.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>     * &lt;p&gt;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>     * This is a nearly line by line conversion of the original C function. The numbered comments are from the<a name="line.103"></a>
-<span class="sourceLineNo">104</span>     * algorithm description, the short C-style ones from the original C code and the ones with "Remark" from me.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>     * &lt;p&gt;<a name="line.105"></a>
-<span class="sourceLineNo">106</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>     *<a name="line.107"></a>
-<span class="sourceLineNo">108</span>     * @param keyBytes<a name="line.108"></a>
-<span class="sourceLineNo">109</span>     *            plaintext that should be hashed<a name="line.109"></a>
-<span class="sourceLineNo">110</span>     * @param salt<a name="line.110"></a>
-<span class="sourceLineNo">111</span>     *            real salt value without prefix or "rounds="<a name="line.111"></a>
-<span class="sourceLineNo">112</span>     * @param saltPrefix<a name="line.112"></a>
-<span class="sourceLineNo">113</span>     *            either $5$ or $6$<a name="line.113"></a>
-<span class="sourceLineNo">114</span>     * @param blocksize<a name="line.114"></a>
-<span class="sourceLineNo">115</span>     *            a value that differs between $5$ and $6$<a name="line.115"></a>
-<span class="sourceLineNo">116</span>     * @param algorithm<a name="line.116"></a>
-<span class="sourceLineNo">117</span>     *            {@link MessageDigest} algorithm identifier string<a name="line.117"></a>
-<span class="sourceLineNo">118</span>     * @return complete hash value including prefix and salt<a name="line.118"></a>
-<span class="sourceLineNo">119</span>     * @throws IllegalArgumentException<a name="line.119"></a>
-<span class="sourceLineNo">120</span>     *             if the given salt is {@code null} or does not match the allowed pattern<a name="line.120"></a>
-<span class="sourceLineNo">121</span>     * @throws IllegalArgumentException<a name="line.121"></a>
-<span class="sourceLineNo">122</span>     *             when a {@link NoSuchAlgorithmException} is caught<a name="line.122"></a>
-<span class="sourceLineNo">123</span>     * @see MessageDigestAlgorithms<a name="line.123"></a>
-<span class="sourceLineNo">124</span>     */<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    private static String sha2Crypt(final byte[] keyBytes, final String salt, final String saltPrefix,<a name="line.125"></a>
-<span class="sourceLineNo">126</span>                                    final int blocksize, final String algorithm) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>        final int keyLen = keyBytes.length;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>        // Extracts effective salt and the number of rounds from the given salt.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        int rounds = ROUNDS_DEFAULT;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        boolean roundsCustom = false;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        if (salt == null) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>            throw new IllegalArgumentException("Salt must not be null");<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>        final Matcher m = SALT_PATTERN.matcher(salt);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>        if (m == null || !m.find()) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>            throw new IllegalArgumentException("Invalid salt value: " + salt);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        if (m.group(3) != null) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>            rounds = Integer.parseInt(m.group(3));<a name="line.142"></a>
-<span class="sourceLineNo">143</span>            rounds = Math.max(ROUNDS_MIN, Math.min(ROUNDS_MAX, rounds));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>            roundsCustom = true;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        final String saltString = m.group(4);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        final byte[] saltBytes = saltString.getBytes(Charsets.UTF_8);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        final int saltLen = saltBytes.length;<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>        // 1. start digest A<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        // Prepare for the real work.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        MessageDigest ctx = DigestUtils.getDigest(algorithm);<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>        // 2. the password string is added to digest A<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        /*<a name="line.155"></a>
-<span class="sourceLineNo">156</span>         * Add the key string.<a name="line.156"></a>
-<span class="sourceLineNo">157</span>         */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        ctx.update(keyBytes);<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>        // 3. the salt string is added to digest A. This is just the salt string<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        // itself without the enclosing '$', without the magic salt_prefix $5$ and<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        // $6$ respectively and without the rounds=&lt;N&gt; specification.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        //<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        // NB: the MD5 algorithm did add the $1$ salt_prefix. This is not deemed<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        // necessary since it is a constant string and does not add security<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        // and /possibly/ allows a plain text attack. Since the rounds=&lt;N&gt;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        // specification should never be added this would also create an<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        // inconsistency.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        /*<a name="line.169"></a>
-<span class="sourceLineNo">170</span>         * The last part is the salt string. This must be at most 16 characters and it ends at the first `$' character<a name="line.170"></a>
-<span class="sourceLineNo">171</span>         * (for compatibility with existing implementations).<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         */<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        ctx.update(saltBytes);<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>        // 4. start digest B<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        /*<a name="line.176"></a>
-<span class="sourceLineNo">177</span>         * Compute alternate sha512 sum with input KEY, SALT, and KEY. The final result will be added to the first<a name="line.177"></a>
-<span class="sourceLineNo">178</span>         * context.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>         */<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        MessageDigest altCtx = DigestUtils.getDigest(algorithm);<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>        // 5. add the password to digest B<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        /*<a name="line.183"></a>
-<span class="sourceLineNo">184</span>         * Add key.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>         */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        altCtx.update(keyBytes);<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>        // 6. add the salt string to digest B<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        /*<a name="line.189"></a>
-<span class="sourceLineNo">190</span>         * Add salt.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>         */<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        altCtx.update(saltBytes);<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>        // 7. add the password again to digest B<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        /*<a name="line.195"></a>
-<span class="sourceLineNo">196</span>         * Add key again.<a name="line.196"></a>
-<span class="sourceLineNo">197</span>         */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        altCtx.update(keyBytes);<a name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>        // 8. finish digest B<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        /*<a name="line.201"></a>
-<span class="sourceLineNo">202</span>         * Now get result of this (32 bytes) and add it to the other context.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>         */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        byte[] altResult = altCtx.digest();<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>        // 9. For each block of 32 or 64 bytes in the password string (excluding<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        // the terminating NUL in the C representation), add digest B to digest A<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        /*<a name="line.208"></a>
-<span class="sourceLineNo">209</span>         * Add for any character in the key one byte of the alternate sum.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>         */<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        /*<a name="line.211"></a>
-<span class="sourceLineNo">212</span>         * (Remark: the C code comment seems wrong for key length &gt; 32!)<a name="line.212"></a>
-<span class="sourceLineNo">213</span>         */<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        int cnt = keyBytes.length;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        while (cnt &gt; blocksize) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>            ctx.update(altResult, 0, blocksize);<a name="line.216"></a>
-<span class="sourceLineNo">217</span>            cnt -= blocksize;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>        // 10. For the remaining N bytes of the password string add the first<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        // N bytes of digest B to digest A<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        ctx.update(altResult, 0, cnt);<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>        // 11. For each bit of the binary representation of the length of the<a name="line.224"></a>
-<span class="sourceLineNo">225</span>        // password string up to and including the highest 1-digit, starting<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        // from to lowest bit position (numeric value 1):<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        //<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        // a) for a 1-digit add digest B to digest A<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        //<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        // b) for a 0-digit add the password string<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        //<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        // NB: this step differs significantly from the MD5 algorithm. It<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        // adds more randomness.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        /*<a name="line.234"></a>
-<span class="sourceLineNo">235</span>         * Take the binary representation of the length of the key and for every 1 add the alternate sum, for every 0<a name="line.235"></a>
-<span class="sourceLineNo">236</span>         * the key.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>         */<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        cnt = keyBytes.length;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        while (cnt &gt; 0) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>            if ((cnt &amp; 1) != 0) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span>                ctx.update(altResult, 0, blocksize);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>            } else {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>                ctx.update(keyBytes);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>            cnt &gt;&gt;= 1;<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>        // 12. finish digest A<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        /*<a name="line.249"></a>
-<span class="sourceLineNo">250</span>         * Create intermediate result.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>         */<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        altResult = ctx.digest();<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>        // 13. start digest DP<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        /*<a name="line.255"></a>
-<span class="sourceLineNo">256</span>         * Start computation of P byte sequence.<a name="line.256"></a>
-<span class="sourceLineNo">257</span>         */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>        altCtx = DigestUtils.getDigest(algorithm);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>        // 14. for every byte in the password (excluding the terminating NUL byte<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        // in the C representation of the string)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        //<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        // add the password to digest DP<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        /*<a name="line.264"></a>
-<span class="sourceLineNo">265</span>         * For every character in the password add the entire password.<a name="line.265"></a>
-<span class="sourceLineNo">266</span>         */<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        for (int i = 1; i &lt;= keyLen; i++) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            altCtx.update(keyBytes);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>        }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>        // 15. finish digest DP<a name="line.271"></a>
+<span class="sourceLineNo">075</span>     * <a name="line.75"></a>
+<span class="sourceLineNo">076</span>     * @param keyBytes<a name="line.76"></a>
+<span class="sourceLineNo">077</span>     *            plaintext to hash<a name="line.77"></a>
+<span class="sourceLineNo">078</span>     * @return complete hash value<a name="line.78"></a>
+<span class="sourceLineNo">079</span>     * @throws RuntimeException<a name="line.79"></a>
+<span class="sourceLineNo">080</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>     */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    public static String sha256Crypt(final byte[] keyBytes) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        return sha256Crypt(keyBytes, null);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>    /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span>     * Generates a libc6 crypt() compatible "$5$" hash value.<a name="line.87"></a>
+<span class="sourceLineNo">088</span>     * &lt;p&gt;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>     * <a name="line.90"></a>
+<span class="sourceLineNo">091</span>     * @param keyBytes<a name="line.91"></a>
+<span class="sourceLineNo">092</span>     *            plaintext to hash<a name="line.92"></a>
+<span class="sourceLineNo">093</span>     * @param salt<a name="line.93"></a>
+<span class="sourceLineNo">094</span>     *            real salt value without prefix or "rounds="<a name="line.94"></a>
+<span class="sourceLineNo">095</span>     * @return complete hash value including salt<a name="line.95"></a>
+<span class="sourceLineNo">096</span>     * @throws IllegalArgumentException<a name="line.96"></a>
+<span class="sourceLineNo">097</span>     *             if the salt does not match the allowed pattern<a name="line.97"></a>
+<span class="sourceLineNo">098</span>     * @throws RuntimeException<a name="line.98"></a>
+<span class="sourceLineNo">099</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.99"></a>
+<span class="sourceLineNo">100</span>     */<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    public static String sha256Crypt(final byte[] keyBytes, String salt) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        if (salt == null) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>            salt = SHA256_PREFIX + B64.getRandomSalt(8);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithms.SHA_256);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>    /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>     * Generates a libc6 crypt() compatible "$5$" or "$6$" SHA2 based hash value.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>     * &lt;p&gt;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>     * This is a nearly line by line conversion of the original C function. The numbered comments are from the algorithm<a name="line.111"></a>
+<span class="sourceLineNo">112</span>     * description, the short C-style ones from the original C code and the ones with "Remark" from me.<a name="line.112"></a>
+<span class="sourceLineNo">113</span>     * &lt;p&gt;<a name="line.113"></a>
+<span class="sourceLineNo">114</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>     * <a name="line.115"></a>
+<span class="sourceLineNo">116</span>     * @param keyBytes<a name="line.116"></a>
+<span class="sourceLineNo">117</span>     *            plaintext to hash<a name="line.117"></a>
+<span class="sourceLineNo">118</span>     * @param salt<a name="line.118"></a>
+<span class="sourceLineNo">119</span>     *            real salt value without prefix or "rounds="<a name="line.119"></a>
+<span class="sourceLineNo">120</span>     * @param saltPrefix<a name="line.120"></a>
+<span class="sourceLineNo">121</span>     *            either $5$ or $6$<a name="line.121"></a>
+<span class="sourceLineNo">122</span>     * @param blocksize<a name="line.122"></a>
+<span class="sourceLineNo">123</span>     *            a value that differs between $5$ and $6$<a name="line.123"></a>
+<span class="sourceLineNo">124</span>     * @param algorithm<a name="line.124"></a>
+<span class="sourceLineNo">125</span>     *            {@link MessageDigest} algorithm identifier string<a name="line.125"></a>
+<span class="sourceLineNo">126</span>     * @return complete hash value including prefix and salt<a name="line.126"></a>
+<span class="sourceLineNo">127</span>     * @throws IllegalArgumentException<a name="line.127"></a>
+<span class="sourceLineNo">128</span>     *             if the given salt is {@code null} or does not match the allowed pattern<a name="line.128"></a>
+<span class="sourceLineNo">129</span>     * @throws IllegalArgumentException<a name="line.129"></a>
+<span class="sourceLineNo">130</span>     *             when a {@link NoSuchAlgorithmException} is caught<a name="line.130"></a>
+<span class="sourceLineNo">131</span>     * @see MessageDigestAlgorithms<a name="line.131"></a>
+<span class="sourceLineNo">132</span>     */<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    private static String sha2Crypt(final byte[] keyBytes, final String salt, final String saltPrefix,<a name="line.133"></a>
+<span class="sourceLineNo">134</span>            final int blocksize, final String algorithm) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>        final int keyLen = keyBytes.length;<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>        // Extracts effective salt and the number of rounds from the given salt.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        int rounds = ROUNDS_DEFAULT;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        boolean roundsCustom = false;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        if (salt == null) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            throw new IllegalArgumentException("Salt must not be null");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>        final Matcher m = SALT_PATTERN.matcher(salt);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        if (m == null || !m.find()) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            throw new IllegalArgumentException("Invalid salt value: " + salt);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        if (m.group(3) != null) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>            rounds = Integer.parseInt(m.group(3));<a name="line.150"></a>
+<span class="sourceLineNo">151</span>            rounds = Math.max(ROUNDS_MIN, Math.min(ROUNDS_MAX, rounds));<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            roundsCustom = true;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        final String saltString = m.group(4);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        final byte[] saltBytes = saltString.getBytes(Charsets.UTF_8);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        final int saltLen = saltBytes.length;<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>        // 1. start digest A<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        // Prepare for the real work.<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        MessageDigest ctx = DigestUtils.getDigest(algorithm);<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>        // 2. the password string is added to digest A<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        /*<a name="line.163"></a>
+<span class="sourceLineNo">164</span>         * Add the key string.<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         */<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        ctx.update(keyBytes);<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>        // 3. the salt string is added to digest A. This is just the salt string<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        // itself without the enclosing '$', without the magic salt_prefix $5$ and<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        // $6$ respectively and without the rounds=&lt;N&gt; specification.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        //<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        // NB: the MD5 algorithm did add the $1$ salt_prefix. This is not deemed<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        // necessary since it is a constant string and does not add security<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        // and /possibly/ allows a plain text attack. Since the rounds=&lt;N&gt;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        // specification should never be added this would also create an<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        // inconsistency.<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        /*<a name="line.177"></a>
+<span class="sourceLineNo">178</span>         * The last part is the salt string. This must be at most 16 characters and it ends at the first `$' character<a name="line.178"></a>
+<span class="sourceLineNo">179</span>         * (for compatibility with existing implementations).<a name="line.179"></a>
+<span class="sourceLineNo">180</span>         */<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        ctx.update(saltBytes);<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>        // 4. start digest B<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        /*<a name="line.184"></a>
+<span class="sourceLineNo">185</span>         * Compute alternate sha512 sum with input KEY, SALT, and KEY. The final result will be added to the first<a name="line.185"></a>
+<span class="sourceLineNo">186</span>         * context.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>         */<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        MessageDigest altCtx = DigestUtils.getDigest(algorithm);<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>        // 5. add the password to digest B<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        /*<a name="line.191"></a>
+<span class="sourceLineNo">192</span>         * Add key.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>         */<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        altCtx.update(keyBytes);<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>        // 6. add the salt string to digest B<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        /*<a name="line.197"></a>
+<span class="sourceLineNo">198</span>         * Add salt.<a name="line.198"></a>
+<span class="sourceLineNo">199</span>         */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        altCtx.update(saltBytes);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>        // 7. add the password again to digest B<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        /*<a name="line.203"></a>
+<span class="sourceLineNo">204</span>         * Add key again.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>         */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>        altCtx.update(keyBytes);<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>        // 8. finish digest B<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        /*<a name="line.209"></a>
+<span class="sourceLineNo">210</span>         * Now get result of this (32 bytes) and add it to the other context.<a name="line.210"></a>
+<span class="sourceLineNo">211</span>         */<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        byte[] altResult = altCtx.digest();<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>        // 9. For each block of 32 or 64 bytes in the password string (excluding<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        // the terminating NUL in the C representation), add digest B to digest A<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        /*<a name="line.216"></a>
+<span class="sourceLineNo">217</span>         * Add for any character in the key one byte of the alternate sum.<a name="line.217"></a>
+<span class="sourceLineNo">218</span>         */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        /*<a name="line.219"></a>
+<span class="sourceLineNo">220</span>         * (Remark: the C code comment seems wrong for key length &gt; 32!)<a name="line.220"></a>
+<span class="sourceLineNo">221</span>         */<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        int cnt = keyBytes.length;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        while (cnt &gt; blocksize) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            ctx.update(altResult, 0, blocksize);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>            cnt -= blocksize;<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>        // 10. For the remaining N bytes of the password string add the first<a name="line.228"></a>
+<span class="sourceLineNo">229</span>        // N bytes of digest B to digest A<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        ctx.update(altResult, 0, cnt);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>        // 11. For each bit of the binary representation of the length of the<a name="line.232"></a>
+<span class="sourceLineNo">233</span>        // password string up to and including the highest 1-digit, starting<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        // from to lowest bit position (numeric value 1):<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        //<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        // a) for a 1-digit add digest B to digest A<a name="line.236"></a>
+<span class="sourceLineNo">237</span>        //<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        // b) for a 0-digit add the password string<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        //<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        // NB: this step differs significantly from the MD5 algorithm. It<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        // adds more randomness.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        /*<a name="line.242"></a>
+<span class="sourceLineNo">243</span>         * Take the binary representation of the length of the key and for every 1 add the alternate sum, for every 0<a name="line.243"></a>
+<span class="sourceLineNo">244</span>         * the key.<a name="line.244"></a>
+<span class="sourceLineNo">245</span>         */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        cnt = keyBytes.length;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        while (cnt &gt; 0) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>            if ((cnt &amp; 1) != 0) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>                ctx.update(altResult, 0, blocksize);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>            } else {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>                ctx.update(keyBytes);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>            }<a name="line.252"></a>
+<span class="sourceLineNo">253</span>            cnt &gt;&gt;= 1;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>        // 12. finish digest A<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        /*<a name="line.257"></a>
+<span class="sourceLineNo">258</span>         * Create intermediate result.<a name="line.258"></a>
+<span class="sourceLineNo">259</span>         */<a name="line.259"></a>
+<span class="sourceLineNo">260</span>        altResult = ctx.digest();<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>        // 13. start digest DP<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        /*<a name="line.263"></a>
+<span class="sourceLineNo">264</span>         * Start computation of P byte sequence.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>         */<a name="line.265"></a>
+<span class="sourceLineNo">266</span>        altCtx = DigestUtils.getDigest(algorithm);<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>        // 14. for every byte in the password (excluding the terminating NUL byte<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        // in the C representation of the string)<a name="line.269"></a>
+<span class="sourceLineNo">270</span>        //<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        // add the password to digest DP<a name="line.271"></a>
 <span class="sourceLineNo">272</span>        /*<a name="line.272"></a>
-<span class="sourceLineNo">273</span>         * Finish the digest.<a name="line.273"></a>
+<span class="sourceLineNo">273</span>         * For every character in the password add the entire password.<a name="line.273"></a>
 <span class="sourceLineNo">274</span>         */<a name="line.274"></a>
-<span class="sourceLineNo">275</span>        byte[] tempResult = altCtx.digest();<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>        // 16. produce byte sequence P of the same length as the password where<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        //<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        // a) for each block of 32 or 64 bytes of length of the password string<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        // the entire digest DP is used<a name="line.280"></a>
-<span class="sourceLineNo">281</span>        //<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        // b) for the remaining N (up to 31 or 63) bytes use the first N<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        // bytes of digest DP<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        /*<a name="line.284"></a>
-<span class="sourceLineNo">285</span>         * Create byte sequence P.<a name="line.285"></a>
-<span class="sourceLineNo">286</span>         */<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        final byte[] pBytes = new byte[keyLen];<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        int cp = 0;<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        while (cp &lt; keyLen - blocksize) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>            System.arraycopy(tempResult, 0, pBytes, cp, blocksize);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>            cp += blocksize;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        System.arraycopy(tempResult, 0, pBytes, cp, keyLen - cp);<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>        // 17. start digest DS<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        /*<a name="line.296"></a>
-<span class="sourceLineNo">297</span>         * Start computation of S byte sequence.<a name="line.297"></a>
-<span class="sourceLineNo">298</span>         */<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        altCtx = DigestUtils.getDigest(algorithm);<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>        // 18. repeast the following 16+A[0] times, where A[0] represents the first<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        // byte in digest A interpreted as an 8-bit unsigned value<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        //<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        // add the salt to digest DS<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        /*<a name="line.305"></a>
-<span class="sourceLineNo">306</span>         * For every character in the password add the entire password.<a name="line.306"></a>
-<span class="sourceLineNo">307</span>         */<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        for (int i = 1; i &lt;= 16 + (altResult[0] &amp; 0xff); i++) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>            altCtx.update(saltBytes);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>        // 19. finish digest DS<a name="line.312"></a>
+<span class="sourceLineNo">275</span>        for (int i = 1; i &lt;= keyLen; i++) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>            altCtx.update(keyBytes);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span>        // 15. finish digest DP<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        /*<a name="line.280"></a>
+<span class="sourceLineNo">281</span>         * Finish the digest.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>         */<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        byte[] tempResult = altCtx.digest();<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>        // 16. produce byte sequence P of the same length as the password where<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        //<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        // a) for each block of 32 or 64 bytes of length of the password string<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        // the entire digest DP is used<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        //<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        // b) for the remaining N (up to 31 or 63) bytes use the first N<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        // bytes of digest DP<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        /*<a name="line.292"></a>
+<span class="sourceLineNo">293</span>         * Create byte sequence P.<a name="line.293"></a>
+<span class="sourceLineNo">294</span>         */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        final byte[] pBytes = new byte[keyLen];<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        int cp = 0;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        while (cp &lt; keyLen - blocksize) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>            System.arraycopy(tempResult, 0, pBytes, cp, blocksize);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>            cp += blocksize;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        System.arraycopy(tempResult, 0, pBytes, cp, keyLen - cp);<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span>        // 17. start digest DS<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        /*<a name="line.304"></a>
+<span class="sourceLineNo">305</span>         * Start computation of S byte sequence.<a name="line.305"></a>
+<span class="sourceLineNo">306</span>         */<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        altCtx = DigestUtils.getDigest(algorithm);<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>        // 18. repeast the following 16+A[0] times, where A[0] represents the first<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        // byte in digest A interpreted as an 8-bit unsigned value<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        //<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        // add the salt to digest DS<a name="line.312"></a>
 <span class="sourceLineNo">313</span>        /*<a name="line.313"></a>
-<span class="sourceLineNo">314</span>         * Finish the digest.<a name="line.314"></a>
+<span class="sourceLineNo">314</span>         * For every character in the password add the entire password.<a name="line.314"></a>
 <span class="sourceLineNo">315</span>         */<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        tempResult = altCtx.digest();<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>        // 20. produce byte sequence S of the same length as the salt string where<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        //<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        // a) for each block of 32 or 64 bytes of length of the salt string<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        // the entire digest DS is used<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        //<a name="line.322"></a>
-<span class="sourceLineNo">323</span>        // b) for the remaining N (up to 31 or 63) bytes use the first N<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        // bytes of digest DS<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        /*<a name="line.325"></a>
-<span class="sourceLineNo">326</span>         * Create byte sequence S.<a name="line.326"></a>
-<span class="sourceLineNo">327</span>         */<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        // Remark: The salt is limited to 16 chars, how does this make sense?<a name="line.328"></a>
-<span class="sourceLineNo">329</span>        final byte[] sBytes = new byte[saltLen];<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        cp = 0;<a name="line.330"></a>
-<span class="sourceLineNo">331</span>        while (cp &lt; saltLen - blocksize) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>            System.arraycopy(tempResult, 0, sBytes, cp, blocksize);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>            cp += blocksize;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>        System.arraycopy(tempResult, 0, sBytes, cp, saltLen - cp);<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>        // 21. repeat a loop according to the number specified in the rounds=&lt;N&gt;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        // specification in the salt (or the default value if none is<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        // present). Each round is numbered, starting with 0 and up to N-1.<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        //<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        // The loop uses a digest as input. In the first round it is the<a name="line.341"></a>
-<span class="sourceLineNo">342</span>        // digest produced in step 12. In the latter steps it is the digest<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        // produced in step 21.h. The following text uses the notation<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        // "digest A/C" to describe this behavior.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        /*<a name="line.345"></a>
-<span class="sourceLineNo">346</span>         * Repeatedly run the collected hash value through sha512 to burn CPU cycles.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>         */<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        for (int i = 0; i &lt;= rounds - 1; i++) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>            // a) start digest C<a name="line.349"></a>
-<span class="sourceLineNo">350</span>            /*<a name="line.350"></a>
-<span class="sourceLineNo">351</span>             * New context.<a name="line.351"></a>
-<span class="sourceLineNo">352</span>             */<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            ctx = DigestUtils.getDigest(algorithm);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>            // b) for odd round numbers add the byte sequense P to digest C<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            // c) for even round numbers add digest A/C<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            /*<a name="line.357"></a>
-<span class="sourceLineNo">358</span>             * Add key or last result.<a name="line.358"></a>
-<span class="sourceLineNo">359</span>             */<a name="line.359"></a>
-<span class="sourceLineNo">360</span>            if ((i &amp; 1) != 0) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>                ctx.update(pBytes, 0, keyLen);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>            } else {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>                ctx.update(altResult, 0, blocksize);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>            // d) for all round numbers not divisible by 3 add the byte sequence S<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            /*<a name="line.367"></a>
-<span class="sourceLineNo">368</span>             * Add salt for numbers not divisible by 3.<a name="line.368"></a>
-<span class="sourceLineNo">369</span>             */<a name="line.369"></a>
-<span class="sourceLineNo">370</span>            if (i % 3 != 0) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>                ctx.update(sBytes, 0, saltLen);<a name="line.371"></a>
+<span class="sourceLineNo">316</span>        for (int i = 1; i &lt;= 16 + (altResult[0] &amp; 0xff); i++) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>            altCtx.update(saltBytes);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>        }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>        // 19. finish digest DS<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        /*<a name="line.321"></a>
+<span class="sourceLineNo">322</span>         * Finish the digest.<a name="line.322"></a>
+<span class="sourceLineNo">323</span>         */<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        tempResult = altCtx.digest();<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>        // 20. produce byte sequence S of the same length as the salt string where<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        //<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        // a) for each block of 32 or 64 bytes of length of the salt string<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        // the entire digest DS is used<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        //<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        // b) for the remaining N (up to 31 or 63) bytes use the first N<a name="line.331"></a>
+<span class="sourceLineNo">332</span>        // bytes of digest DS<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        /*<a name="line.333"></a>
+<span class="sourceLineNo">334</span>         * Create byte sequence S.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>         */<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        // Remark: The salt is limited to 16 chars, how does this make sense?<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        final byte[] sBytes = new byte[saltLen];<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        cp = 0;<a name="line.338"></a>
+<span class="sourceLineNo">339</span>        while (cp &lt; saltLen - blocksize) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            System.arraycopy(tempResult, 0, sBytes, cp, blocksize);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>            cp += blocksize;<a name="line.341"></a>
+<span class="sourceLineNo">342</span>        }<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        System.arraycopy(tempResult, 0, sBytes, cp, saltLen - cp);<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>        // 21. repeat a loop according to the number specified in the rounds=&lt;N&gt;<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        // specification in the salt (or the default value if none is<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        // present). Each round is numbered, starting with 0 and up to N-1.<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        //<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        // The loop uses a digest as input. In the first round it is the<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        // digest produced in step 12. In the latter steps it is the digest<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        // produced in step 21.h. The following text uses the notation<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        // "digest A/C" to describe this behavior.<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        /*<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         * Repeatedly run the collected hash value through sha512 to burn CPU cycles.<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        for (int i = 0; i &lt;= rounds - 1; i++) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            // a) start digest C<a name="line.357"></a>
+<span class="sourceLineNo">358</span>            /*<a name="line.358"></a>
+<span class="sourceLineNo">359</span>             * New context.<a name="line.359"></a>
+<span class="sourceLineNo">360</span>             */<a name="line.360"></a>
+<span class="sourceLineNo">361</span>            ctx = DigestUtils.getDigest(algorithm);<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span>            // b) for odd round numbers add the byte sequense P to digest C<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            // c) for even round numbers add digest A/C<a name="line.364"></a>
+<span class="sourceLineNo">365</span>            /*<a name="line.365"></a>
+<span class="sourceLineNo">366</span>             * Add key or last result.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>             */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>            if ((i &amp; 1) != 0) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>                ctx.update(pBytes, 0, keyLen);<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            } else {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>                ctx.update(altResult, 0, blocksize);<a name="line.371"></a>
 <span class="sourceLineNo">372</span>            }<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>            // e) for all round numbers not divisible by 7 add the byte sequence P<a name="line.374"></a>
+<span class="sourceLineNo">374</span>            // d) for all round numbers not divisible by 3 add the byte sequence S<a name="line.374"></a>
 <span class="sourceLineNo">375</span>            /*<a name="line.375"></a>
-<span class="sourceLineNo">376</span>             * Add key for numbers not divisible by 7.<a name="line.376"></a>
+<span class="sourceLineNo">376</span>             * Add salt for numbers not divisible by 3.<a name="line.376"></a>
 <span class="sourceLineNo">377</span>             */<a name="line.377"></a>
-<span class="sourceLineNo">378</span>            if (i % 7 != 0) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>                ctx.update(pBytes, 0, keyLen);<a name="line.379"></a>
+<span class="sourceLineNo">378</span>            if (i % 3 != 0) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>                ctx.update(sBytes, 0, saltLen);<a name="line.379"></a>
 <span class="sourceLineNo">380</span>            }<a name="line.380"></a>
 <span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>            // f) for odd round numbers add digest A/C<a name="line.382"></a>
-<span class="sourceLineNo">383</span>            // g) for even round numbers add the byte sequence P<a name="line.383"></a>
-<span class="sourceLineNo">384</span>            /*<a name="line.384"></a>
-<span class="sourceLineNo">385</span>             * Add key or last result.<a name="line.385"></a>
-<span class="sourceLineNo">386</span>             */<a name="line.386"></a>
-<span class="sourceLineNo">387</span>            if ((i &amp; 1) != 0) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                ctx.update(altResult, 0, blocksize);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            } else {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>                ctx.update(pBytes, 0, keyLen);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>            // h) finish digest C.<a name="line.393"></a>
-<span class="sourceLineNo">394</span>            /*<a name="line.394"></a>
-<span class="sourceLineNo">395</span>             * Create intermediate result.<a name="line.395"></a>
-<span class="sourceLineNo">396</span>             */<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            altResult = ctx.digest();<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>        // 22. Produce the output string. This is an ASCII string of the maximum<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        // size specified above, consisting of multiple pieces:<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        //<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        // a) the salt salt_prefix, $5$ or $6$ respectively<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        //<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        // b) the rounds=&lt;N&gt; specification, if one was present in the input<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        // salt string. A trailing '$' is added in this case to separate<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        // the rounds specification from the following text.<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        //<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        // c) the salt string truncated to 16 characters<a name="line.409"></a>
+<span class="sourceLineNo">382</span>            // e) for all round numbers not divisible by 7 add the byte sequence P<a name="line.382"></a>
+<span class="sourceLineNo">383</span>            /*<a name="line.383"></a>
+<span class="sourceLineNo">384</span>             * Add key for numbers not divisible by 7.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>             */<a name="line.385"></a>
+<span class="sourceLineNo">386</span>            if (i % 7 != 0) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>                ctx.update(pBytes, 0, keyLen);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>            // f) for odd round numbers add digest A/C<a name="line.390"></a>
+<span class="sourceLineNo">391</span>            // g) for even round numbers add the byte sequence P<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            /*<a name="line.392"></a>
+<span class="sourceLineNo">393</span>             * Add key or last result.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>             */<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            if ((i &amp; 1) != 0) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>                ctx.update(altResult, 0, blocksize);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            } else {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>                ctx.update(pBytes, 0, keyLen);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>            // h) finish digest C.<a name="line.401"></a>
+<span class="sourceLineNo">402</span>            /*<a name="line.402"></a>
+<span class="sourceLineNo">403</span>             * Create intermediate result.<a name="line.403"></a>
+<span class="sourceLineNo">404</span>             */<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            altResult = ctx.digest();<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        }<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span>        // 22. Produce the output string. This is an ASCII string of the maximum<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        // size specified above, consisting of multiple pieces:<a name="line.409"></a>
 <span class="sourceLineNo">410</span>        //<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        // d) a '$' character<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        /*<a name="line.412"></a>
-<span class="sourceLineNo">413</span>         * Now we can construct the result string. It consists of three parts.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>         */<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        final StringBuilder buffer = new StringBuilder(saltPrefix);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        if (roundsCustom) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            buffer.append(ROUNDS_PREFIX);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>            buffer.append(rounds);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>            buffer.append("$");<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        buffer.append(saltString);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>        buffer.append("$");<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>        // e) the base-64 encoded final C digest. The encoding used is as<a name="line.424"></a>
-<span class="sourceLineNo">425</span>        // follows:<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        // [...]<a name="line.426"></a>
-<span class="sourceLineNo">427</span>        //<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        // Each group of three bytes from the digest produces four<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        // characters as output:<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        //<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        // 1. character: the six low bits of the first byte<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        // 2. character: the two high bits of the first byte and the<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        // four low bytes from the second byte<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        // 3. character: the four high bytes from the second byte and<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        // the two low bits from the third byte<a name="line.435"></a>
-<span class="sourceLineNo">436</span>        // 4. character: the six high bits from the third byte<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        //<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        // The groups of three bytes are as follows (in this sequence).<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        // These are the indices into the byte array containing the<a name="line.439"></a>
-<span class="sourceLineNo">440</span>        // digest, starting with index 0. For the last group there are<a name="line.440"></a>
-<span class="sourceLineNo">441</span>        // not enough bytes left in the digest and the value zero is used<a name="line.441"></a>
-<span class="sourceLineNo">442</span>        // in its place. This group also produces only three or two<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        // characters as output for SHA-512 and SHA-512 respectively.<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span>        // This was just a safeguard in the C implementation:<a name="line.445"></a>
-<span class="sourceLineNo">446</span>        // int buflen = salt_prefix.length() - 1 + ROUNDS_PREFIX.length() + 9 + 1 + salt_string.length() + 1 + 86 + 1;<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>        if (blocksize == 32) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            B64.b64from24bit(altResult[0], altResult[10], altResult[20], 4, buffer);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>            B64.b64from24bit(altResult[21], altResult[1], altResult[11], 4, buffer);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>            B64.b64from24bit(altResult[12], altResult[22], altResult[2], 4, buffer);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            B64.b64from24bit(altResult[3], altResult[13], altResult[23], 4, buffer);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            B64.b64from24bit(altResult[24], altResult[4], altResult[14], 4, buffer);<a name="line.453"></a>
-<span class="sourceLineNo">454</span>            B64.b64from24bit(altResult[15], altResult[25], altResult[5], 4, buffer);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>            B64.b64from24bit(altResult[6], altResult[16], altResult[26], 4, buffer);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>            B64.b64from24bit(altResult[27], altResult[7], altResult[17], 4, buffer);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>            B64.b64from24bit(altResult[18], altResult[28], altResult[8], 4, buffer);<a name="line.457"></a>
-<span class="sourceLineNo">458</span>            B64.b64from24bit(altResult[9], altResult[19], altResult[29], 4, buffer);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>            B64.b64from24bit((byte) 0, altResult[31], altResult[30], 3, buffer);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        } else {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>            B64.b64from24bit(altResult[0], altResult[21], altResult[42], 4, buffer);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>            B64.b64from24bit(altResult[22], altResult[43], altResult[1], 4, buffer);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>            B64.b64from24bit(altResult[44], altResult[2], altResult[23], 4, buffer);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>            B64.b64from24bit(altResult[3], altResult[24], altResult[45], 4, buffer);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>            B64.b64from24bit(altResult[25], altResult[46], altResult[4], 4, buffer);<a name="line.465"></a>
-<span class="sourceLineNo">466</span>            B64.b64from24bit(altResult[47], altResult[5], altResult[26], 4, buffer);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>            B64.b64from24bit(altResult[6], altResult[27], altResult[48], 4, buffer);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>            B64.b64from24bit(altResult[28], altResult[49], altResult[7], 4, buffer);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>            B64.b64from24bit(altResult[50], altResult[8], altResult[29], 4, buffer);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>            B64.b64from24bit(altResult[9], altResult[30], altResult[51], 4, buffer);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>            B64.b64from24bit(altResult[31], altResult[52], altResult[10], 4, buffer);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>            B64.b64from24bit(altResult[53], altResult[11], altResult[32], 4, buffer);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>            B64.b64from24bit(altResult[12], altResult[33], altResult[54], 4, buffer);<a name="line.473"></a>
-<span class="sourceLineNo">474</span>            B64.b64from24bit(altResult[34], altResult[55], altResult[13], 4, buffer);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>            B64.b64from24bit(altResult[56], altResult[14], altResult[35], 4, buffer);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>            B64.b64from24bit(altResult[15], altResult[36], altResult[57], 4, buffer);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>            B64.b64from24bit(altResult[37], altResult[58], altResult[16], 4, buffer);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>            B64.b64from24bit(altResult[59], altResult[17], altResult[38], 4, buffer);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>            B64.b64from24bit(altResult[18], altResult[39], altResult[60], 4, buffer);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>            B64.b64from24bit(altResult[40], altResult[61], altResult[19], 4, buffer);<a name="line.480"></a>
-<span class="sourceLineNo">481</span>            B64.b64from24bit(altResult[62], altResult[20], altResult[41], 4, buffer);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>            B64.b64from24bit((byte) 0, (byte) 0, altResult[63], 2, buffer);<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>        /*<a name="line.485"></a>
-<span class="sourceLineNo">486</span>         * Clear the buffer for the intermediate result so that people attaching to processes or reading core dumps<a name="line.486"></a>
-<span class="sourceLineNo">487</span>         * cannot get any information.<a name="line.487"></a>
-<span class="sourceLineNo">488</span>         */<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        // Is there a better way to do this with the JVM?<a name="line.489"></a>
-<span class="sourceLineNo">490</span>        Arrays.fill(tempResult, (byte) 0);<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        Arrays.fill(pBytes, (byte) 0);<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        Arrays.fill(sBytes, (byte) 0);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>        ctx.reset();<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        altCtx.reset();<a name="line.494"></a>
-<span class="sourceLineNo">495</span>        Arrays.fill(keyBytes, (byte) 0);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        Arrays.fill(saltBytes, (byte) 0);<a name="line.496"></a>
-<span class="sourceLineNo">497</span><a name="line.497"></a>
-<span class="sourceLineNo">498</span>        return buffer.toString();<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span>    /**<a name="line.501"></a>
-<span class="sourceLineNo">502</span>     * Generates a libc crypt() compatible "$6$" hash value with random salt.<a name="line.502"></a>
-<span class="sourceLineNo">503</span>     * &lt;p&gt;<a name="line.503"></a>
-<span class="sourceLineNo">504</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.504"></a>
-<span class="sourceLineNo">505</span>     *<a name="line.505"></a>
-<span class="sourceLineNo">506</span>     * @throws RuntimeException<a name="line.506"></a>
-<span class="sourceLineNo">507</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.507"></a>
-<span class="sourceLineNo">508</span>     */<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    public static String sha512Crypt(final byte[] keyBytes) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        return sha512Crypt(keyBytes, null);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>    /**<a name="line.513"></a>
-<span class="sourceLineNo">514</span>     * Generates a libc6 crypt() compatible "$6$" hash value.<a name="line.514"></a>
-<span class="sourceLineNo">515</span>     * &lt;p&gt;<a name="line.515"></a>
-<span class="sourceLineNo">516</span>     * See {@link Crypt#crypt(String, String)} for details.<a name="line.516"></a>
-<span class="sourceLineNo">517</span>     *<a name="line.517"></a>
-<span class="sourceLineNo">518</span>     * @throws IllegalArgumentException<a name="line.518"></a>
-<span class="sourceLineNo">519</span>     *             if the salt does not match the allowed pattern<a name="line.519"></a>
-<span class="sourceLineNo">520</span>     * @throws RuntimeException<a name="line.520"></a>
-<span class="sourceLineNo">521</span>     *             when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.521"></a>
-<span class="sourceLineNo">522</span>     */<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    public static String sha512Crypt(final byte[] keyBytes, String salt) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        if (salt == null) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>            salt = SHA512_PREFIX + B64.getRandomSalt(8);<a name="line.525"></a>
-<span class="sourceLineNo">526</span>        }<a name="line.526"></a>
-<span class="sourceLineNo">527</span>        return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithms.SHA_512);<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
-<span class="sourceLineNo">529</span>}<a name="line.529"></a>
+<span class="sourceLineNo">411</span>        // a) the salt salt_prefix, $5$ or $6$ respectively<a name="line.411"></a>
+<span class="sourceLineNo">412</span>        //<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        // b) the rounds=&lt;N&gt; specification, if one was present in the input<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        // salt string. A trailing '$' is added in this case to separate<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        // the rounds specification from the following text.<a name="line.415"></a>
+<span class="sourceLineNo">416</span>        //<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        // c) the salt string truncated to 16 characters<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        //<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        // d) a '$' character<a name="line.419"></a>
+<span class="sourceLineNo">420</span>        /*<a name="line.420"></a>
+<span class="sourceLineNo">421</span>         * Now we can construct the result string. It consists of three parts.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>         */<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        final StringBuilder buffer = new StringBuilder(saltPrefix);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        if (roundsCustom) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>            buffer.append(ROUNDS_PREFIX);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>            buffer.append(rounds);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>            buffer.append("$");<a name="line.427"></a>
+<span class="sourceLineNo">428</span>        }<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        buffer.append(saltString);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        buffer.append("$");<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>        // e) the base-64 encoded final C digest. The encoding used is as<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        // follows:<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        // [...]<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        //<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        // Each group of three bytes from the digest produces four<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        // characters as output:<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        //<a name="line.438"></a>
+<span class="sourceLineNo">439</span>        // 1. character: the six low bits of the first byte<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        // 2. character: the two high bits of the first byte and the<a name="line.440"></a>
+<span class="sourceLineNo">441</span>        // four low bytes from the second byte<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        // 3. character: the four high bytes from the second byte and<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        // the two low bits from the third byte<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        // 4. character: the six high bits from the third byte<a name="line.444"></a>
+<span class="sourceLineNo">445</span>        //<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        // The groups of three bytes are as follows (in this sequence).<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        // These are the indices into the byte array containing the<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        // digest, starting with index 0. For the last group there are<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        // not enough bytes left in the digest and the value zero is used<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        // in its place. This group also produces only three or two<a name="line.450"></a>
+<span class="sourceLineNo">451</span>        // characters as output for SHA-512 and SHA-512 respectively.<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span>        // This was just a safeguard in the C implementation:<a name="line.453"></a>
+<span class="sourceLineNo">454</span>        // int buflen = salt_prefix.length() - 1 + ROUNDS_PREFIX.length() + 9 + 1 + salt_string.length() + 1 + 86 + 1;<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span>        if (blocksize == 32) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>            B64.b64from24bit(altResult[0], altResult[10], altResult[20], 4, buffer);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>            B64.b64from24bit(altResult[21], altResult[1], altResult[11], 4, buffer);<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            B64.b64from24bit(altResult[12], altResult[22], altResult[2], 4, buffer);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>            B64.b64from24bit(altResult[3], altResult[13], altResult[23], 4, buffer);<a name="line.460"></a>
+<span class="sourceLineNo">461</span>            B64.b64from24bit(altResult[24], altResult[4], altResult[14], 4, buffer);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>            B64.b64from24bit(altResult[15], altResult[25], altResult[5], 4, buffer);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>            B64.b64from24bit(altResult[6], altResult[16], altResult[26], 4, buffer);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>            B64.b64from24bit(altResult[27], altResult[7], altResult[17], 4, buffer);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>            B64.b64from24bit(altResult[18], altResult[28], altResult[8], 4, buffer);<a name="line.465"></a>
+<span class="sourceLineNo">466</span>            B64.b64from24bit(altResult[9], altResult[19], altResult[29], 4, buffer);<a name="line.466"></a>
+<span class="sourceLineNo">467</span>            B64.b64from24bit((byte) 0, altResult[31], altResult[30], 3, buffer);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>        } else {<a name="line.468"></a>
+<span class="sourceLineNo">469</span>            B64.b64from24bit(altResult[0], altResult[21], altResult[42], 4, buffer);<a name="line.469"></a>
+<span class="sourceLineNo">470</span>            B64.b64from24bit(altResult[22], altResult[43], altResult[1], 4, buffer);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>            B64.b64from24bit(altResult[44], altResult[2], altResult[23], 4, buffer);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>            B64.b64from24bit(altResult[3], altResult[24], altResult[45], 4, buffer);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            B64.b64from24bit(altResult[25], altResult[46], altResult[4], 4, buffer);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>            B64.b64from24bit(altResult[47], altResult[5], altResult[26], 4, buffer);<a name="line.474"></a>
+<span class="sourceLineNo">475</span>            B64.b64from24bit(altResult[6], altResult[27], altResult[48], 4, buffer);<a name="line.475"></a>
+<span class="sourceLineNo">476</span>            B64.b64from24bit(altResult[28], altResult[49], altResult[7], 4, buffer);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>            B64.b64from24bit(altResult[50], altResult[8], altResult[29], 4, buffer);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>            B64.b64from24bit(altResult[9], altResult[30], altResult[51], 4, buffer);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>            B64.b64from24bit(altResult[31], altResult[52], altResult[10], 4, buffer);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>            B64.b64from24bit(altResult[53], altResult[11], altResult[32], 4, buffer);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>            B64.b64from24bit(altResult[12], altResult[33], altResult[54], 4, buffer);<a name="line.481"></a>
+<span class="sourceLineNo">482</span>            B64.b64from24bit(altResult[34], altResult[55], altResult[13], 4, buffer);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>            B64.b64from24bit(altResult[56], altResult[14], altResult[35], 4, buffer);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>            B64.b64from24bit(altResult[15], altResult[36], altResult[57], 4, buffer);<a name="line.484"></a>
+<span class="sourceLineNo">485</span>            B64.b64from24bit(altResult[37], altResult[58], altResult[16], 4, buffer);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>            B64.b64from24bit(altResult[59], altResult[17], altResult[38], 4, buffer);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>            B64.b64from24bit(altResult[18], altResult[39], altResult[60], 4, buffer);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>            B64.b64from24bit(altResult[40], altResult[61], altResult[19], 4, buffer);<a name="line.488"></a>

[... 61 lines stripped ...]


Mime
View raw message