altos: Use standard FIPS testing for chaoskey

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 33a9ab91dc053f1f972b99261878f68e1c02093a..cfa1fa2746da84690ba3df658f6e19b04eafebfa 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 import java.io.*;
@@ -493,9 +494,10 @@ public class AltosLib {
                return r;
        }
 
-       public static int fromdec(String s) throws NumberFormatException {
-               int c, v = 0;
-               int sign = 1;
+       public static long fromdec(String s) throws NumberFormatException {
+               int c;
+               long v = 0;
+               long sign = 1;
                for (int i = 0; i < s.length(); i++) {
                        c = s.charAt(i);
                        if (i == 0 && c == '-') {