View | Details | Raw Unified | Return to bug 53050
Collapse All | Expand All

(-)container/catalina/src/share/org/apache/catalina/session/ManagerBase.java (-2 / +8 lines)
Lines 25-30 Link Here
25
import java.io.File;
25
import java.io.File;
26
import java.io.FileInputStream;
26
import java.io.FileInputStream;
27
import java.io.IOException;
27
import java.io.IOException;
28
import java.io.UnsupportedEncodingException;
28
import java.lang.reflect.Method;
29
import java.lang.reflect.Method;
29
import java.security.AccessController;
30
import java.security.AccessController;
30
import java.security.MessageDigest;
31
import java.security.MessageDigest;
Lines 396-402 Link Here
396
                // Ignore
397
                // Ignore
397
            }
398
            }
398
            if (apr) {
399
            if (apr) {
399
                setEntropy(new String(result));
400
                try {
401
                    setEntropy(new String(result, "ISO-8859-1"));
402
                } catch (UnsupportedEncodingException ux) {
403
                    // ISO-8859-1 should always be supported
404
                    throw new Error(ux);
405
                }
400
            } else {
406
            } else {
401
                setEntropy(this.toString());
407
                setEntropy(this.toString());
402
            }
408
            }
Lines 561-567 Link Here
561
            long t1 = seed;
567
            long t1 = seed;
562
            char entropy[] = getEntropy().toCharArray();
568
            char entropy[] = getEntropy().toCharArray();
563
            for (int i = 0; i < entropy.length; i++) {
569
            for (int i = 0; i < entropy.length; i++) {
564
                long update = ((byte) entropy[i]) << ((i % 8) * 8);
570
                long update = ((long) entropy[i]) << ((i % 8) * 8);
565
                seed ^= update;
571
                seed ^= update;
566
            }
572
            }
567
            try {
573
            try {

Return to bug 53050