update testing

diff --git a/testing/Makefile b/testing/Makefile
index 8ef82ce8ae0c69afb4423621a54734741e822e04..06d00ef5f3cd1f3164aaa5b6d4b60bf28a7a46c8 100644 (file)
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -57,10 +57,12 @@ testN1Emu: testN1Emu.o $(SHAREDOBJS) $(NOBJS)
 testN2Emu.o: testN2Emu.c compat.h
 testN2Emu: testN2Emu.o $(SHAREDOBJS) $(NOBJS)
        $(CXX) $(CXXFLAGS) $^ $(LIBS) -L../systems/nagra -lsc-nagra -o $@
+       @echo "don't forget: export LD_LIBRARY_PATH=../systems/nagra"
 
 testN2RunEmu.o: testN2RunEmu.c
 testN2RunEmu: testN2RunEmu.o $(SHAREDOBJS) $(NOBJS)
        $(CXX) $(CXXFLAGS) $^ $(LIBS) -L../systems/nagra -lsc-nagra -o $@
+       @echo "don't forget: export LD_LIBRARY_PATH=../systems/nagra"
 
 filterhelper: filterhelper.o
        $(CXX) $(CXXFLAGS) $^ -o $@

diff --git a/testing/testN2Emu.c b/testing/testN2Emu.c
index 5e85ce6581440112342b8a1dff42e9efbc149779..c2ea053d98cede98dad4603f46c6b5e6c9647d80 100644 (file)
--- a/testing/testN2Emu.c
+++ b/testing/testN2Emu.c
@@ -136,7 +136,7 @@ bool Ecm(unsigned char *buff, int cmdLen, int id)
   if(ecmP) ecmP->PrintCaps(L_SYS_ECM);
 
   int l=0, mecmAlgo=0;
-  for(int i=16; i<cmdLen-10 && l!=3; ) {
+  for(int i=(buff[14]&0x10)?16:20; i<cmdLen-10 && l!=3; ) {
 printf("%02x: nano %02x\n",i,buff[i]);
     switch(buff[i]) {
       case 0x10: