From 3d1121f2fbaf165e89aa82d525847fb23b027efa Mon Sep 17 00:00:00 2001
From: Diederik de Groot <dkgroot@talon.nl>
Date: Tue, 14 Jul 2020 17:38:11 +0200
Subject: [PATCH] Update XMLDefault loadinfo

---
 data/firmware/894x/BOOT894x.0-0-2-0.bin.sgn | Bin 111552 -> 111552 bytes
 data/settings/XMLDefault.cnf.xml            | 153 ++++++++++++++++++++
 etc/certs/encrypt                           |   8 +-
 3 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/data/firmware/894x/BOOT894x.0-0-2-0.bin.sgn b/data/firmware/894x/BOOT894x.0-0-2-0.bin.sgn
index e08d599923e6e0165332e8c4bd57c4c0a356fffc..332bb99b417f084d9df61310a30971553405b7ca 100644
GIT binary patch
delta 276
zcmV+v0qg$2=LW#%29SM!pVzqS=Pk5;@RZEm_=0rfhoDaXzd@-Q)?C1Q8rZ@#?ezF1
zZIrA$w)&|sXB9C^Qi(#k^arJR#f=FR6BFt$-<tCDxb5sMM4xNZkWxAGYHh%UF!tF1
zqD-SYF7qjGe_{2I(H(`#&cJVu!h`m_CXI0}pNDpD*~)yau~X%L+XGH2q9WzU?j}fG
z##(&MX*ksfd`4;B&2$orr4W~MyQIY1LXA5j0-xldQ@eg$MaUPo=F%U(nrJn(v2tM-
znh{bMHzJ!0UUlwuHJ87{pI#8wf{@j_>F0G+1*Jgh4@jq+3)2<!Q{u$!E42agnZh8k
a-gw#cP4)s^@=xIc1)76>0k?et0YkC`>yTFf

delta 276
zcmV+v0qg$2=LW#%29SM!r<f1ClU{=56Dm}HJ<QFkR|B!W0$rHhZ6y4Rf%!K;CM4VU
z;MV>qxJDQ5P}!Ig0=ur5Y7qd%4aB}Y=Uu+b*w(yI-_3LqMIiTK;X_jeB=Qs<Iv=v+
z;c~oLo7zv&?7NX)@tFe}!?|x&;oPWXI3>?b9mz<5po~~|eEZLTy^4g1l=I2Mat;;p
z=r}N)FL@~65<tzLqFH=Q<EcI}58{b1B&fL<rScKe?w~p_Mw+CdRtVjWEWoNQTjNaK
zg!I>r{-?C2U7TCHrvk#+=Ghf8wwz*<bpgR{a7;RV-hl`sk^i47E*9V8ko;HauX}fA
a|NAQ<vj=T_0Obh+%b|mP0k?et0YkFLc#KW}

diff --git a/data/settings/XMLDefault.cnf.xml b/data/settings/XMLDefault.cnf.xml
index 7616dc3..61856c2 100644
--- a/data/settings/XMLDefault.cnf.xml
+++ b/data/settings/XMLDefault.cnf.xml
@@ -45,6 +45,159 @@
   </devicePool>
   <!-- End Device Pool -->
 
+  <!--
+    loadInformation1 - Cisco 30 SP +
+    loadInformation2 - Cisco 12 SP +
+    loadInformation3 - Cisco 12 SP
+    loadInformation4 - Cisco 12S
+    loadInformation5 - Cisco 30 VIP
+    loadInformation6 - Cisco 910
+    loadInformation7 - Cisco 7960
+    loadInformation8 - Cisco 7940
+    loadInformation9 - Cisco 7935
+    loadInformation10 - Cisco VGC Phone
+    loadInformation11 - Cisco VGC Virtual Phone
+    loadInformation12 - Cisco ATA 186
+    loadInformation30 - Analog Access
+    loadInformation40 - Digital Access
+    loadInformation42 - Digital Access +
+    loadInformation43 - Digital Access WS-X6608
+    loadInformation47 - Analog Access WS-X6624
+    loadInformation51 - Conference Bridge WS-X6608
+    loadInformation61 - H. 323 Phone
+    loadInformation100 - load Simulator
+    loadInformation111 - Media Termination Point Hardware
+    loadInformation115 - Cisco 7941
+    loadInformation118 - Cisco 7971G GE
+    loadInformation119 - Cisco 7971
+    loadInformation120 - MGCP station
+    loadInformation121 - MGCP trunk
+    loadInformation124 - Cisco 7914
+    loadInformation227 - Cisco 7915 12-Button
+    loadInformation228 - Cisco 7915 24-Button
+    loadInformation229 - Cisco 7916 12-button
+    loadInformation230 - Cisco 7916 24-Button
+    loadInformation302 - Cisco 7985
+    loadInformation307 - Cisco 7911
+    loadInformation308 - Cisco 7961G GE
+    loadInformation309 - Cisco 7941G GE
+    loadInformation335 - Motorola CN622
+    loadInformation348 - Cisco 7931
+    loadInformation358 - Cisco Unified Personal Communicator
+    loadInformation365 - Cisco 7921
+    loadInformation369 - Cisco 7906
+    loadInformation375 - Cisco TelePresence
+    loadInformation376 - Nokia S60
+    loadInformation404 - Cisco 7962
+    loadInformation412 - Cisco 3951
+    loadInformation431 - Cisco 7937
+    loadInformation434 - Cisco 7942
+    loadInformation435 - Cisco 7945
+    loadInformation436 - Cisco 7965
+    loadInformation437 - Cisco 7975
+    loadInformation446 - Cisco 3911
+    loadInformation478 - Cisco TelePresence 1000
+    loadInformation479 - Cisco TelePresence 3000
+    loadInformation480 - Cisco TelePresence 3200
+    loadInformation481 - Cisco TelePresence 500-37
+    loadInformation484 - Cisco 7925
+    loadInformation493 - Cisco 9971
+    loadInformation495 - Cisco 6921
+    loadInformation496 - Cisco 6941
+    loadInformation497 - Cisco 6961
+    loadInformation503 - Cisco Unified Client Services Framework
+    loadInformation505 - Cisco TelePresence 1300-65
+    loadInformation520 - Cisco TelePresence 1100
+    loadInformation521 - Transnova S3
+    loadInformation537 - Cisco 9951
+    loadInformation540 - Cisco 8961
+    loadInformation547 - Cisco 6901
+    loadInformation548 - Cisco 6911
+    loadInformation550 - Cisco ATA 187
+    loadInformation557 - Cisco TelePresence 200
+    loadInformation558 - Cisco TelePresence 400
+    loadInformation562 - Cisco Dual Mode for iPhone
+    loadInformation564 - Cisco 6945
+    loadInformation575 - Cisco Dual Mode for Android
+    loadInformation577 - Cisco 7926
+    loadInformation580 - Cisco E20
+    loadInformation582 - Generic Single Screen Room System
+    loadInformation583 - Generic Multiple Screen Room System
+    loadInformation584 - Cisco TelePresence EX90
+    loadInformation585 - Cisco 8945
+    loadInformation586 - Cisco 8941
+    loadInformation588 - Generic Desktop Video Endpoint
+    loadInformation590 - Cisco TelePresence 500-32
+    loadInformation591 - Cisco TelePresence 1300-47
+    loadInformation592 - Cisco 3905
+    loadInformation593 - Cisco Cius
+    loadInformation596 - Cisco TelePresence TX1310-65
+    loadInformation604 - Cisco TelePresence EX60
+    loadInformation606 - Cisco TelePresence Codec C90
+    loadInformation607 - Cisco TelePresence Codec C60
+    loadInformation608 - Cisco TelePresence Codec C40
+    loadInformation609 - Cisco TelePresence Quick Set C20
+    loadInformation610 - Cisco TelePresence Profile 42 (C20)
+    loadInformation611 - Cisco TelePresence Profile 42 (C60)
+    loadInformation612 - Cisco TelePresence Profile 52 (C40)
+    loadInformation613 - Cisco TelePresence Profile 52 (C60)
+    loadInformation614 - Cisco TelePresence Profile 52 Dual (C60)
+    loadInformation615 - Cisco TelePresence Profile 65 (C60)
+    loadInformation616 - Cisco TelePresence Profile 65 Dual (C90)
+    loadInformation617 - Cisco TelePresence MX200
+    loadInformation619 - Cisco TelePresence TX9000
+    loadInformation620 - Cisco TelePresence TX9200
+    loadInformation621 - Cisco 7821
+    loadInformation622 - Cisco 7841
+    loadInformation623 - Cisco 7861
+    loadInformation626 - Cisco TelePresence SX20
+    loadInformation627 - Cisco TelePresence MX300
+    loadInformation628 - IMS-integrated Mobile (Basic)
+    loadInformation632 - Cisco Cius SP
+    loadInformation633 - Cisco TelePresence Profile 42 (C40)
+    loadInformation634 - Cisco VXC 6215
+    loadInformation635 - CTI Remote Device
+    loadInformation642 - Carrier-integrated Mobile
+    loadInformation645 - Universal Device Template
+    loadInformation647 - Cisco DX650
+    loadInformation648 - Cisco Unified Communications for RTX
+    loadInformation652 - Cisco Jabber for Tablet
+    loadInformation659 - Cisco 8831
+    loadInformation682 - Cisco TelePresence SX10
+    loadInformation683 - Cisco 8841
+    loadInformation684 - Cisco 8851
+    loadInformation685 - Cisco 8861
+    loadInformation688 - Cisco TelePresence SX80
+    loadInformation689 - Cisco TelePresence MX200 G2
+    loadInformation690 - Cisco TelePresence MX300 G2
+    loadInformation20000 - Cisco 7905
+    loadInformation30002 - Cisco 7920
+    loadInformation30006 - Cisco 7970
+    loadInformation30007 - Cisco 7912
+    loadInformation30008 - Cisco 7902
+    loadInformation30016 - Cisco IP Communicator
+    loadInformation30018 - Cisco 7961
+    loadInformation30019 - Cisco 7936
+    loadInformation30027 - Analog Phone
+    loadInformation30028 - ISDN BRI Phone
+    loadInformation30032 - SCCP gateway virtual phone
+    loadInformation30035 - IP STE
+    loadInformation36042 - Cisco DX80
+    loadInformation36043 - Cisco DX70
+    loadInformation36207 - Cisco TelePresence MX700
+    loadInformation36208 - Cisco TelePresence MX800
+    loadInformation80000 - Cisco CP-521G
+    loadInformation80001 - Cisco CP-524G
+    loadInformation80002 - Cisco CP-525G
+    loadInformation80003 - Cisco SPA502G
+    loadInformation80004 - Cisco SPA504G
+    loadInformation80005 - Cisco SPA525G
+    loadInformation80006 - Cisco SPA508G
+    loadInformation80007 - Cisco SPA509G
+    loadInformation80009 - Cisco CP-525G2
+    loadInformation80010 - Cisco SPA301
+    loadInformation80011 - Cisco SPA303
+  -->
   <!-- Begin Firmware Load Information for all known SCCP Device Types -->
   <loadInformation00005 model="Cisco IP Phone 7961">SCCP41.9-4-2SR3-1S</loadInformation00005>
   <loadInformation00006 model="Cisco IP Phone 7910">SCCP11.9-0-2SR1S</loadInformation00006>
diff --git a/etc/certs/encrypt b/etc/certs/encrypt
index 832575e..a84b32f 100755
--- a/etc/certs/encrypt
+++ b/etc/certs/encrypt
@@ -1,7 +1,7 @@
 #!/bin/bash
-
+ROOTDIR=/data/development/sccp/sources/tftp 
 if [ $# -gt 0 ]; then
 	#  Encrypt SEPMAC.cnf.xml
-	openssl enc -aes-256-cbc -salt -in ../../tftpboot/settings/${1} -out ../../tftpboot/settings/${1}.enc -k tftp.pem
-	../../tools/certutils/sgnfile -b ../../tftpboot/settings/${1}.enc -c tftp.pem
-fi
\ No newline at end of file
+	openssl enc -aes-256-cbc -salt -in $ROOTDIR/data/settings/${1} -out $ROOTDIR/data/settings/${1}.enc -k $ROOTDIR/etc/certs/tftp.pem
+	../../tools/certutils/sgnfile -b $ROOTDIR/data/settings/${1}.enc -c $ROOTDIR/etc/certs/tftp.pem
+fi