QRouland
/
DUT2PTUT
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modifié: m/fichier/conf 

supprimé:        ssl/server.crt
	supprimé:        ssl/server.csr
	supprimé:        ssl/server.key
	supprimé:        ssl/server.key.org
	modifié:         superTornado.py
This commit is contained in:
sidya82 2014-03-23 20:35:05 +01:00
parent b0e4e16030
commit 07eb51ab17
6 changed files with 2 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m/fichier/conf
View File

@ -2,7 +2,7 @@ blind=1
camera=192.168.1.13
portCamera=80
idUrlCamera=test:a
endUrlCamera=image.jpg?cidx=791836195
endUrlCamera=/image.jpg
serv=192.168.1.12
portServ=80

14
ssl/server.crt
View File

@ -1,14 +0,0 @@
-----BEGIN CERTIFICATE-----
MIICEzCCAXwCCQCKYvtVGc/3uTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJG
UjEPMA0GA1UECAwGRnJhbmNlMRAwDgYDVQQHDAdCbGFnbmFjMQwwCgYDVQQKDANJ
VVQxDjAMBgNVBAMMBVNpZHlhMB4XDTE0MDMxMjE1MjQ1MVoXDTE1MDMxMjE1MjQ1
MVowTjELMAkGA1UEBhMCRlIxDzANBgNVBAgMBkZyYW5jZTEQMA4GA1UEBwwHQmxh
Z25hYzEMMAoGA1UECgwDSVVUMQ4wDAYDVQQDDAVTaWR5YTCBnzANBgkqhkiG9w0B
AQEFAAOBjQAwgYkCgYEAqVr3GB3eaqvPO2/mzglsHLiTVkJqg987l7JfmXJ3JgIn
eTZrfBQ1UBAgT6RwRtPN5KPQcntujph+wfHfE8ifloYWra8twbIrIbOTZAv4jJx6
LHp1Libh7r+hOvtpuu5Q1qnHIlhrs2+pdGGkgbnFiKngyhmRxDnaTqXoBHxSLx0C
AwEAATANBgkqhkiG9w0BAQUFAAOBgQCoEDMgGCO1MVbnEGr+BbRHtQX5YEv2PEst
ljVBgCinkGIf0PAeJn5Y+w7rSD5X04E2WkY7s0rmCnZhDXqAHpTPlXgdd+tzaBau
IumPOLef3FqdCN4E2lkhT9AGGLpafN3xqtdzlIedo9ow3x+fmR9LRN43W0CTbzpr
wwDlypd3oA==
-----END CERTIFICATE-----

11
ssl/server.csr
View File

@ -1,11 +0,0 @@
-----BEGIN CERTIFICATE REQUEST-----
MIIBjTCB9wIBADBOMQswCQYDVQQGEwJGUjEPMA0GA1UECAwGRnJhbmNlMRAwDgYD
VQQHDAdCbGFnbmFjMQwwCgYDVQQKDANJVVQxDjAMBgNVBAMMBVNpZHlhMIGfMA0G
CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCpWvcYHd5qq887b+bOCWwcuJNWQmqD3zuX
sl+ZcncmAid5Nmt8FDVQECBPpHBG083ko9Bye26OmH7B8d8TyJ+Whhatry3Bsish
s5NkC/iMnHosenUuJuHuv6E6+2m67lDWqcciWGuzb6l0YaSBucWIqeDKGZHEOdpO
pegEfFIvHQIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEABv3Y6obyLa+FoZHQRydd
YDrGLjOxjvCkJFWRncIFOtF+xaX1HJsfeNJKqhPwwdXGclmMrE5SrJqa/bxIXWaq
R5glAePI0GOq3YiZTyKLp6dBy1gOD0yeGEQi7sXVPQrbd1sRpJUYN8YLPCmuNQQO
BtH9sYPI7zkasgGZOU0E5/0=
-----END CERTIFICATE REQUEST-----

15
ssl/server.key
View File

@ -1,15 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIICXQIBAAKBgQCpWvcYHd5qq887b+bOCWwcuJNWQmqD3zuXsl+ZcncmAid5Nmt8
FDVQECBPpHBG083ko9Bye26OmH7B8d8TyJ+Whhatry3Bsishs5NkC/iMnHosenUu
JuHuv6E6+2m67lDWqcciWGuzb6l0YaSBucWIqeDKGZHEOdpOpegEfFIvHQIDAQAB
AoGAZ0gyqWKN4kAlgfocqErWxC1Mra6Thxj9HuaJputH/sYRjLrDkkhAuzMagXen
gYpqZqYA2dCs/AnERENd6JLRv9yHGwvLZcsgQbDRJ3xN/O8uJb6lPRhrZZp3PV/F
dFSyGhsvCwj0M99DVFORqy/9tn4Jx2iSLFpl7CjJceJMw4ECQQDaNMGB+Djl8PWL
S751YZiL1jKPskWDN0podxlQR+5OoELq7KQmkI49fwabAsZLPEnxEpVTotZ0z/O6
txLz92lLAkEAxrArmCi2xTg+55hzsh9MN7e5RX10B6J0wFTQ+GKk5fOBaytp9F8p
lJrUHHkoQcwFkG0Esa7Yk+/fb6ocf/WwNwJBAIdHKaif8PZtOm1PWhZ/mQkolFQN
25aL0q+NFr50ucM5DAOFDgdymxx5AelcAP9nsxenw7gEPhxRR/M7yJ5Dhp0CQQDE
pp8vRbTIdIgGL2TreoC0cPpF5gpOeCN4LTp7bR7qnd2NFfYTsZB1Dd08pUoL/YPQ
U6aeuoCPw43xdnwoxiJ3AkAW1qbAkHvIY9gCdVrH1GC4997s37yTOojGnCHqL0cD
x08xq6MAb+7T49rOegaD5Cp7iFbz9+X02JjL3tXWVB9I
-----END RSA PRIVATE KEY-----

18
ssl/server.key.org
View File

@ -1,18 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
DEK-Info: DES-EDE3-CBC,9DD19B28ED090F97
/KGNluMDOySyVdfCHXn4uVGYPfrBC6v7npJ3aeOmrPPqpQwOg5TRxaKNU+XPNzG/
bNWrlYGiRIVRmb9RwZNnvg8L6r7ui7s+WkrEtaO/pAfYgNvoLrIqe5kiCRvl0b/g
0JZwjjFW2vju+DezdG6bn4vUc6iVYRKH/jU/igVCpGhz4HTbbtIibVwUptHx5Zrv
9u/H7Sru+Upj3dz++G3vq6BUk6cZMPOyOGNeyLyUAJ/QmlQ9Z6UWsq+61LJxtK1D
rOuefifzhWL2bU9MRslYvt4ZyO3x62zuqXCnp8r5xDGudxJYPwx1siexTQLFX1nU
6r3iw7MiO2oDKwnDW2dmRVIfyd7hVy9XuytzFNADDJjLtmjtUWbpDhCfEwOtSWaO
aQL+2rAZtJNO30q2xzcnZqT5EkcMmeJUuoc9julJQzryAWFUSfFKMyLKbEqya+6R
NUhEBpsBpgi0nxzVaq+thJGkZMzPGRGRDVN7oUiTqoiKgM2dXXaZ7c1JndggWPDm
IDkHy/g3G4c3NqF8lY6rNzhKX3oiX88F0MnysUE7jukCw9kza+t4nq8mp/QcdZYh
dQte/74fX97fvZ9aJ8RJ7qN48Sygxq86rdtpKqBzfW37JzE/4TO8lOR6pkmucJCI
Bd9LbrPtgjlxiGBjg3meZtDEMHITYNCoxIhS0l6+DzgLRaSKpn0kIpGaVzaPEqVh
CF8ELhTr90NgrkRNq6ae2Sg8W+l+cI3kqeNO+rVwk42vfkJwMkYOCCS1+kav924n
2pO6OJkd9iR20Q5qv8WwZwBYQChw2VyFg9McLXZspkyCsWPC6VHifw==
-----END RSA PRIVATE KEY-----

2
superTornado.py
View File

@ -293,7 +293,7 @@ if __name__ == "__main__":
print ""
GlobalVars.urlSocket = 'ws://'+GlobalVars.ipServ+':'+GlobalVars.portCamera+'/socket'
GlobalVars.urlCamera = 'http://'+GlobalVars.idUrlCamera+'@'+GlobalVars.ipCamera+':'+GlobalVars.portCamera+'/'+GlobalVars.endUrlCamera
GlobalVars.urlCamera = 'http://'+GlobalVars.idUrlCamera+'@'+GlobalVars.ipCamera+':'+GlobalVars.portCamera+GlobalVars.endUrlCamera
GlobalVars.log.printL("->Ping camera ...",lvl.INFO)
try :