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

(-)java/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 416-422 Link Here
416
                // Ignore
417
                // Ignore
417
            }
418
            }
418
            if (apr) {
419
            if (apr) {
419
                setEntropy(new String(result));
420
                try {
421
                    setEntropy(new String(result, "ISO-8859-1"));
422
                } catch (UnsupportedEncodingException ux) {
423
                    // ISO-8859-1 should always be supported
424
                    throw new Error(ux);
425
                }
420
            } else {
426
            } else {
421
                setEntropy(this.toString());
427
                setEntropy(this.toString());
422
            }
428
            }
Lines 580-586 Link Here
580
            long t1 = seed;
586
            long t1 = seed;
581
            char entropy[] = getEntropy().toCharArray();
587
            char entropy[] = getEntropy().toCharArray();
582
            for (int i = 0; i < entropy.length; i++) {
588
            for (int i = 0; i < entropy.length; i++) {
583
                long update = ((byte) entropy[i]) << ((i % 8) * 8);
589
                long update = ((long) entropy[i]) << ((i % 8) * 8);
584
                seed ^= update;
590
                seed ^= update;
585
            }
591
            }
586
            try {
592
            try {

Return to bug 53050