Merge pull request #290 from DSheirer/289-shoutcast-2-credentials-encryption-error

289 Shoutcast 2 Login Error

build/build.xml

@@ -6,8 +6,8 @@
     <!-- version properties -->
     <property name="major" value="0"/>
     <property name="minor" value="3"/>
-    <property name="patch" value="2"/>
+    <property name="patch" value="1"/>
-    <property name="release" value=""/>
+    <property name="release" value=""/> <!-- Use dash (-) prefix (e.g. -beta1) -->
     <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
 
     <!-- Build properties -->
@@ -34,7 +34,7 @@
         <mkdir dir="${output.classes}"/>
 
         <!-- Create version file -->
-        <echo message="${major}.${minor}.${patch}-${release}" file="${output.classes}/sdrtrunk-version"/>
+        <echo message="${major}.${minor}.${patch}${release}" file="${output.classes}/sdrtrunk-version"/>
     </target>
 
     <target name="compile" depends="clean,init,compile-java-8,compile-java-9"

src/edac/CRCLJ.java

@@ -163,7 +163,7 @@ public class CRCLJ
     }
 
     /**
-     * Identifies 1 bit error positions that match the checksum error value.
+     * Identifies 1 or 2 bit error positions that match the checksum error value.
      */
     public static int[] findBitErrors( int checksumError )
     {
@@ -180,6 +180,24 @@ public class CRCLJ
 			}
 		}
 
+    	/* Two bit errors */
+		for( int x = 0; x < 48; x++ )
+		{
+			for( int y = 0; y < 48; y++ )
+			{
+				if( x != y && 
+					( CHECKSUMS[ x ] ^ CHECKSUMS[ y ] ) == checksumError )
+				{
+					int[] errors = new int[ 2 ];
+
+					errors[ 0 ] = x;
+					errors[ 1 ] = y;
+					
+					return errors;
+				}
+			}
+		}
+		
 		return null;
     }