You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/12/24 21:40:32 UTC
svn commit: r891687 [4/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...
Modified: websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Md5Crypt.html
==============================================================================
--- websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Md5Crypt.html (original)
+++ websites/production/commons/content/proper/commons-codec/apidocs/src-html/org/apache/commons/codec/digest/Md5Crypt.html Tue Dec 24 20:40:26 2013
@@ -50,7 +50,7 @@
<span class="sourceLineNo">042</span> * <p><a name="line.42"></a>
<span class="sourceLineNo">043</span> * This class is immutable and thread-safe.<a name="line.43"></a>
<span class="sourceLineNo">044</span> *<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @version $Id: Md5Crypt.java 1429868 2013-01-07 16:08:05Z ggregory $<a name="line.45"></a>
+<span class="sourceLineNo">045</span> * @version $Id: Md5Crypt.java 1552861 2013-12-21 02:03:17Z ggregory $<a name="line.45"></a>
<span class="sourceLineNo">046</span> * @since 1.7<a name="line.46"></a>
<span class="sourceLineNo">047</span> */<a name="line.47"></a>
<span class="sourceLineNo">048</span>public class Md5Crypt {<a name="line.48"></a>
@@ -70,226 +70,244 @@
<span class="sourceLineNo">062</span> /**<a name="line.62"></a>
<span class="sourceLineNo">063</span> * See {@link #apr1Crypt(String, String)} for details.<a name="line.63"></a>
<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @throws RuntimeException<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * when a {@link java.security.NoSuchAlgorithmException} is caught. *<a name="line.66"></a>
-<span class="sourceLineNo">067</span> */<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public static String apr1Crypt(final byte[] keyBytes) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> return apr1Crypt(keyBytes, APR1_PREFIX + B64.getRandomSalt(8));<a name="line.69"></a>
-<span class="sourceLineNo">070</span> }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> /**<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * See {@link #apr1Crypt(String, String)} for details.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> *<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @throws IllegalArgumentException<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * if the salt does not match the allowed pattern<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * @throws RuntimeException<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public static String apr1Crypt(final byte[] keyBytes, String salt) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> // to make the md5Crypt regex happy<a name="line.81"></a>
-<span class="sourceLineNo">082</span> if (salt != null && !salt.startsWith(APR1_PREFIX)) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> salt = APR1_PREFIX + salt;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> }<a name="line.84"></a>
-<span class="sourceLineNo">085</span> return Md5Crypt.md5Crypt(keyBytes, salt, APR1_PREFIX);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * See {@link #apr1Crypt(String, String)} for details.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @throws RuntimeException<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> */<a name="line.93"></a>
-<span class="sourceLineNo">094</span> public static String apr1Crypt(final String keyBytes) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> return apr1Crypt(keyBytes.getBytes(Charsets.UTF_8));<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * Generates an Apache htpasswd compatible "$apr1$" MD5 based hash value.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
-<span class="sourceLineNo">101</span> * The algorithm is identical to the crypt(3) "$1$" one but produces different outputs due to the different salt<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * prefix.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> *<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @param keyBytes<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * plaintext string that should be hashed.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * @param salt<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * salt string including the prefix and optionally garbage at the end. Will be generated randomly if<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * null.<a name="line.108"></a>
-<span class="sourceLineNo">109</span> * @return computed hash value<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * @throws IllegalArgumentException<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * if the salt does not match the allowed pattern<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * @throws RuntimeException<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public static String apr1Crypt(final String keyBytes, final String salt) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return apr1Crypt(keyBytes.getBytes(Charsets.UTF_8), salt);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * Generates a libc6 crypt() compatible "$1$" hash value.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * <p><a name="line.121"></a>
-<span class="sourceLineNo">122</span> * See {@link Crypt#crypt(String, String)} for details.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> *<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws RuntimeException<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public static String md5Crypt(final byte[] keyBytes) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> return md5Crypt(keyBytes, MD5_PREFIX + B64.getRandomSalt(8));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Generates a libc crypt() compatible "$1$" MD5 based hash value.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * <p><a name="line.133"></a>
-<span class="sourceLineNo">134</span> * See {@link Crypt#crypt(String, String)} for details.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> *<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @param keyBytes<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * plaintext string that should be hashed.<a name="line.137"></a>
-<span class="sourceLineNo">138</span> * @param salt<a name="line.138"></a>
-<span class="sourceLineNo">139</span> * salt string including the prefix and optionally garbage at the end. Will be generated randomly if<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * null.<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @return computed hash value<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * @throws IllegalArgumentException<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * if the salt does not match the allowed pattern<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @throws RuntimeException<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public static String md5Crypt(final byte[] keyBytes, final String salt) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> return md5Crypt(keyBytes, salt, MD5_PREFIX);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> /**<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * Generates a libc6 crypt() "$1$" or Apache htpasswd "$apr1$" hash value.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * <p><a name="line.153"></a>
-<span class="sourceLineNo">154</span> * See {@link Crypt#crypt(String, String)} or {@link #apr1Crypt(String, String)} for details.<a name="line.154"></a>
-<span class="sourceLineNo">155</span> *<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @throws IllegalArgumentException<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * if the salt does not match the allowed pattern<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @throws RuntimeException<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public static String md5Crypt(final byte[] keyBytes, final String salt, final String prefix) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> final int keyLen = keyBytes.length;<a name="line.162"></a>
+<span class="sourceLineNo">065</span> * @param keyBytes<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * plaintext string to hash.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @return the hash value<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * @throws RuntimeException<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * when a {@link java.security.NoSuchAlgorithmException} is caught. *<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public static String apr1Crypt(final byte[] keyBytes) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return apr1Crypt(keyBytes, APR1_PREFIX + B64.getRandomSalt(8));<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * See {@link #apr1Crypt(String, String)} for details.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @param keyBytes<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * plaintext string to hash.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @param salt An APR1 salt.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @return the hash value<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @throws IllegalArgumentException<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * if the salt does not match the allowed pattern<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * @throws RuntimeException<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public static String apr1Crypt(final byte[] keyBytes, String salt) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // to make the md5Crypt regex happy<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (salt != null && !salt.startsWith(APR1_PREFIX)) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> salt = APR1_PREFIX + salt;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return Md5Crypt.md5Crypt(keyBytes, salt, APR1_PREFIX);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> /**<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * See {@link #apr1Crypt(String, String)} for details.<a name="line.96"></a>
+<span class="sourceLineNo">097</span> *<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param keyBytes<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * plaintext string to hash.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * @return the hash value<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @throws RuntimeException<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> */<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public static String apr1Crypt(final String keyBytes) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> return apr1Crypt(keyBytes.getBytes(Charsets.UTF_8));<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 an Apache htpasswd compatible "$apr1$" MD5 based hash value.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <p><a name="line.110"></a>
+<span class="sourceLineNo">111</span> * The algorithm is identical to the crypt(3) "$1$" one but produces different outputs due to the different salt<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * prefix.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> *<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @param keyBytes<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * plaintext string to hash.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * @param salt<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * salt string including the prefix and optionally garbage at the end. Will be generated randomly if<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * null.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * @return the hash value<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * @throws IllegalArgumentException<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * if the salt does not match the allowed pattern<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @throws RuntimeException<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> */<a name="line.124"></a>
+<span class="sourceLineNo">125</span> public static String apr1Crypt(final String keyBytes, final String salt) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> return apr1Crypt(keyBytes.getBytes(Charsets.UTF_8), salt);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> /**<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * Generates a libc6 crypt() compatible "$1$" hash value.<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * <p><a name="line.131"></a>
+<span class="sourceLineNo">132</span> * See {@link Crypt#crypt(String, String)} for details.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> *<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @param keyBytes<a name="line.134"></a>
+<span class="sourceLineNo">135</span> * plaintext string to hash.<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * @return the hash value<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * @throws RuntimeException<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> */<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public static String md5Crypt(final byte[] keyBytes) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return md5Crypt(keyBytes, MD5_PREFIX + B64.getRandomSalt(8));<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<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> * Generates a libc crypt() compatible "$1$" MD5 based hash value.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * <p><a name="line.146"></a>
+<span class="sourceLineNo">147</span> * See {@link Crypt#crypt(String, String)} for details.<a name="line.147"></a>
+<span class="sourceLineNo">148</span> *<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * @param keyBytes<a name="line.149"></a>
+<span class="sourceLineNo">150</span> * plaintext string to hash.<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @param salt<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * salt string including the prefix and optionally garbage at the end. Will be generated randomly if<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * null.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * @return the hash value<a name="line.154"></a>
+<span class="sourceLineNo">155</span> * @throws IllegalArgumentException<a name="line.155"></a>
+<span class="sourceLineNo">156</span> * if the salt does not match the allowed pattern<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @throws RuntimeException<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> */<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public static String md5Crypt(final byte[] keyBytes, final String salt) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> return md5Crypt(keyBytes, salt, MD5_PREFIX);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> // Extract the real salt from the given string which can be a complete hash string.<a name="line.164"></a>
-<span class="sourceLineNo">165</span> String saltString;<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (salt == null) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> saltString = B64.getRandomSalt(8);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> } else {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> final Pattern p = Pattern.compile("^" + prefix.replace("$", "\\$") + "([\\.\\/a-zA-Z0-9]{1,8}).*");<a name="line.169"></a>
-<span class="sourceLineNo">170</span> final Matcher m = p.matcher(salt);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (m == null || !m.find()) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> throw new IllegalArgumentException("Invalid salt value: " + salt);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> saltString = m.group(1);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> final byte[] saltBytes = saltString.getBytes(Charsets.UTF_8);<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> final MessageDigest ctx = DigestUtils.getMd5Digest();<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> /*<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * The password first, since that is what is most unknown<a name="line.181"></a>
-<span class="sourceLineNo">182</span> */<a name="line.182"></a>
-<span class="sourceLineNo">183</span> ctx.update(keyBytes);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /*<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * Then our magic string<a name="line.186"></a>
-<span class="sourceLineNo">187</span> */<a name="line.187"></a>
-<span class="sourceLineNo">188</span> ctx.update(prefix.getBytes(Charsets.UTF_8));<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> /*<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * Then the raw salt<a name="line.191"></a>
-<span class="sourceLineNo">192</span> */<a name="line.192"></a>
-<span class="sourceLineNo">193</span> ctx.update(saltBytes);<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> /*<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * Then just as many characters of the MD5(pw,salt,pw)<a name="line.196"></a>
-<span class="sourceLineNo">197</span> */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> MessageDigest ctx1 = DigestUtils.getMd5Digest();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> ctx1.update(keyBytes);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> ctx1.update(saltBytes);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> ctx1.update(keyBytes);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> byte[] finalb = ctx1.digest();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> int ii = keyLen;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> while (ii > 0) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> ctx.update(finalb, 0, ii > 16 ? 16 : ii);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> ii -= 16;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> /*<a name="line.209"></a>
-<span class="sourceLineNo">210</span> * Don't leave anything around in vm they could use.<a name="line.210"></a>
-<span class="sourceLineNo">211</span> */<a name="line.211"></a>
-<span class="sourceLineNo">212</span> Arrays.fill(finalb, (byte) 0);<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> /*<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * Then something really weird...<a name="line.215"></a>
-<span class="sourceLineNo">216</span> */<a name="line.216"></a>
-<span class="sourceLineNo">217</span> ii = keyLen;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> final int j = 0;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> while (ii > 0) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> if ((ii & 1) == 1) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> ctx.update(finalb[j]);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> } else {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> ctx.update(keyBytes[j]);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span> ii >>= 1;<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> /*<a name="line.228"></a>
-<span class="sourceLineNo">229</span> * Now make the output string<a name="line.229"></a>
-<span class="sourceLineNo">230</span> */<a name="line.230"></a>
-<span class="sourceLineNo">231</span> final StringBuilder passwd = new StringBuilder(prefix + saltString + "$");<a name="line.231"></a>
-<span class="sourceLineNo">232</span> finalb = ctx.digest();<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> /*<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * and now, just to make sure things don't run too fast On a 60 Mhz Pentium this takes 34 msec, so you would<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * need 30 seconds to build a 1000 entry dictionary...<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> for (int i = 0; i < ROUNDS; i++) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> ctx1 = DigestUtils.getMd5Digest();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> if ((i & 1) != 0) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> ctx1.update(keyBytes);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> } else {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> ctx1.update(finalb, 0, BLOCKSIZE);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * Generates a libc6 crypt() "$1$" or Apache htpasswd "$apr1$" hash value.<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * <p><a name="line.166"></a>
+<span class="sourceLineNo">167</span> * See {@link Crypt#crypt(String, String)} or {@link #apr1Crypt(String, String)} for details.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * <a name="line.168"></a>
+<span class="sourceLineNo">169</span> * @param keyBytes<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * plaintext string to hash.<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @param salt May be null.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * @param prefix salt prefix<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @return the hash value<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * @throws IllegalArgumentException<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * if the salt does not match the allowed pattern<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws RuntimeException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * when a {@link java.security.NoSuchAlgorithmException} is caught.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public static String md5Crypt(final byte[] keyBytes, final String salt, final String prefix) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> final int keyLen = keyBytes.length;<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> // Extract the real salt from the given string which can be a complete hash string.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> String saltString;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (salt == null) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> saltString = B64.getRandomSalt(8);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> } else {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> final Pattern p = Pattern.compile("^" + prefix.replace("$", "\\$") + "([\\.\\/a-zA-Z0-9]{1,8}).*");<a name="line.187"></a>
+<span class="sourceLineNo">188</span> final Matcher m = p.matcher(salt);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (m == null || !m.find()) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> throw new IllegalArgumentException("Invalid salt value: " + salt);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> saltString = m.group(1);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span> final byte[] saltBytes = saltString.getBytes(Charsets.UTF_8);<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> final MessageDigest ctx = DigestUtils.getMd5Digest();<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span> /*<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * The password first, since that is what is most unknown<a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> ctx.update(keyBytes);<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /*<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * Then our magic string<a name="line.204"></a>
+<span class="sourceLineNo">205</span> */<a name="line.205"></a>
+<span class="sourceLineNo">206</span> ctx.update(prefix.getBytes(Charsets.UTF_8));<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /*<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Then the raw salt<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> ctx.update(saltBytes);<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> /*<a name="line.213"></a>
+<span class="sourceLineNo">214</span> * Then just as many characters of the MD5(pw,salt,pw)<a name="line.214"></a>
+<span class="sourceLineNo">215</span> */<a name="line.215"></a>
+<span class="sourceLineNo">216</span> MessageDigest ctx1 = DigestUtils.getMd5Digest();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> ctx1.update(keyBytes);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> ctx1.update(saltBytes);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> ctx1.update(keyBytes);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> byte[] finalb = ctx1.digest();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> int ii = keyLen;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> while (ii > 0) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> ctx.update(finalb, 0, ii > 16 ? 16 : ii);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ii -= 16;<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<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> * Don't leave anything around in vm they could use.<a name="line.228"></a>
+<span class="sourceLineNo">229</span> */<a name="line.229"></a>
+<span class="sourceLineNo">230</span> Arrays.fill(finalb, (byte) 0);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> /*<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * Then something really weird...<a name="line.233"></a>
+<span class="sourceLineNo">234</span> */<a name="line.234"></a>
+<span class="sourceLineNo">235</span> ii = keyLen;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> final int j = 0;<a name="line.236"></a>
+<span class="sourceLineNo">237</span> while (ii > 0) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if ((ii & 1) == 1) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> ctx.update(finalb[j]);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> } else {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> ctx.update(keyBytes[j]);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> ii >>= 1;<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> if (i % 3 != 0) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> ctx1.update(saltBytes);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (i % 7 != 0) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> ctx1.update(keyBytes);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span> if ((i & 1) != 0) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> ctx1.update(finalb, 0, BLOCKSIZE);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> } else {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> ctx1.update(keyBytes);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span> finalb = ctx1.digest();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // The following was nearly identical to the Sha2Crypt code.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> // Again, the buflen is not really needed.<a name="line.263"></a>
-<span class="sourceLineNo">264</span> // int buflen = MD5_PREFIX.length() - 1 + salt_string.length() + 1 + BLOCKSIZE + 1;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> B64.b64from24bit(finalb[0], finalb[6], finalb[12], 4, passwd);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> B64.b64from24bit(finalb[1], finalb[7], finalb[13], 4, passwd);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> B64.b64from24bit(finalb[2], finalb[8], finalb[14], 4, passwd);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> B64.b64from24bit(finalb[3], finalb[9], finalb[15], 4, passwd);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> B64.b64from24bit(finalb[4], finalb[10], finalb[5], 4, passwd);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> B64.b64from24bit((byte) 0, (byte) 0, finalb[11], 2, passwd);<a name="line.270"></a>
+<span class="sourceLineNo">246</span> /*<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Now make the output string<a name="line.247"></a>
+<span class="sourceLineNo">248</span> */<a name="line.248"></a>
+<span class="sourceLineNo">249</span> final StringBuilder passwd = new StringBuilder(prefix + saltString + "$");<a name="line.249"></a>
+<span class="sourceLineNo">250</span> finalb = ctx.digest();<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> /*<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * and now, just to make sure things don't run too fast On a 60 Mhz Pentium this takes 34 msec, so you would<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * need 30 seconds to build a 1000 entry dictionary...<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> for (int i = 0; i < ROUNDS; i++) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> ctx1 = DigestUtils.getMd5Digest();<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if ((i & 1) != 0) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> ctx1.update(keyBytes);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> } else {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> ctx1.update(finalb, 0, BLOCKSIZE);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (i % 3 != 0) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> ctx1.update(saltBytes);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (i % 7 != 0) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> ctx1.update(keyBytes);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> /*<a name="line.272"></a>
-<span class="sourceLineNo">273</span> * Don't leave anything around in vm they could use.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> */<a name="line.274"></a>
-<span class="sourceLineNo">275</span> // Is there a better way to do this with the JVM?<a name="line.275"></a>
-<span class="sourceLineNo">276</span> ctx.reset();<a name="line.276"></a>
-<span class="sourceLineNo">277</span> ctx1.reset();<a name="line.277"></a>
-<span class="sourceLineNo">278</span> Arrays.fill(keyBytes, (byte) 0);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> Arrays.fill(saltBytes, (byte) 0);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> Arrays.fill(finalb, (byte) 0);<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> return passwd.toString();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span>}<a name="line.284"></a>
+<span class="sourceLineNo">272</span> if ((i & 1) != 0) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> ctx1.update(finalb, 0, BLOCKSIZE);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> } else {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> ctx1.update(keyBytes);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span> finalb = ctx1.digest();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> // The following was nearly identical to the Sha2Crypt code.<a name="line.280"></a>
+<span class="sourceLineNo">281</span> // Again, the buflen is not really needed.<a name="line.281"></a>
+<span class="sourceLineNo">282</span> // int buflen = MD5_PREFIX.length() - 1 + salt_string.length() + 1 + BLOCKSIZE + 1;<a name="line.282"></a>
+<span class="sourceLineNo">283</span> B64.b64from24bit(finalb[0], finalb[6], finalb[12], 4, passwd);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> B64.b64from24bit(finalb[1], finalb[7], finalb[13], 4, passwd);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> B64.b64from24bit(finalb[2], finalb[8], finalb[14], 4, passwd);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> B64.b64from24bit(finalb[3], finalb[9], finalb[15], 4, passwd);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> B64.b64from24bit(finalb[4], finalb[10], finalb[5], 4, passwd);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> B64.b64from24bit((byte) 0, (byte) 0, finalb[11], 2, passwd);<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> /*<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * Don't leave anything around in vm they could use.<a name="line.291"></a>
+<span class="sourceLineNo">292</span> */<a name="line.292"></a>
+<span class="sourceLineNo">293</span> // Is there a better way to do this with the JVM?<a name="line.293"></a>
+<span class="sourceLineNo">294</span> ctx.reset();<a name="line.294"></a>
+<span class="sourceLineNo">295</span> ctx1.reset();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> Arrays.fill(keyBytes, (byte) 0);<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Arrays.fill(saltBytes, (byte) 0);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> Arrays.fill(finalb, (byte) 0);<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> return passwd.toString();<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>}<a name="line.302"></a>