# HG changeset patch # User Oliver Maurhart # Date 1414592302 -3600 # Node ID d7ef04254e9c54a6863b6ee2e20636657b8e38fa # Parent bfac95f9ac41625d652eb80aebdb8e9ee06d5c65 lizenz fixed in all files diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity.iss --- a/OpenSecurity.iss Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity.iss Wed Oct 29 15:18:22 2014 +0100 @@ -2,21 +2,20 @@ ; OpenSecurity setup file for use with ; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php) -; OpenSecurity -; ============ -; ; Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology ; ; -; X-Net Technologies GmbH +; X-Net Services GmbH ; Elisabethstrasse 1 ; 4020 Linz ; AUSTRIA +; https://www.x-net.at ; ; AIT Austrian Institute of Technology ; Donau City Strasse 1 ; 1220 Wien ; AUSTRIA +; http://www.ait.ac.at ; ; ; Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,7 +30,6 @@ ; See the License for the specific language governing permissions and ; limitations under the License. - [Setup] AppName=OpenSecurity AppContact=AIT Austrian Institute of Technology @@ -55,6 +53,7 @@ UninstallDisplayIcon={app}\bin\ui\gfx\OpenSecurity.ico [Files] +Source: "OpenSecurity\Lizenz.txt"; DestDir: "{app}"; Source: "OpenSecurity\bin\*"; Excludes: "*.pyc,*.swp"; DestDir: "{app}\bin"; Flags: recursesubdirs createallsubdirs; Source: "OpenSecurity\cygwin64\*"; DestDir: "{app}\cygwin64"; Flags: recursesubdirs createallsubdirs; Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs createallsubdirs; diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/__init__.py --- a/OpenSecurity/bin/__init__.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/__init__.py Wed Oct 29 15:18:22 2014 +0100 @@ -10,7 +10,7 @@ # Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # # -# X-Net Technologies GmbH +# X-Net Services GmbH # Elisabethstrasse 1 # 4020 Linz # AUSTRIA diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/create-cert-and-iso.sh --- a/OpenSecurity/bin/create-cert-and-iso.sh Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/create-cert-and-iso.sh Wed Oct 29 15:18:22 2014 +0100 @@ -1,7 +1,39 @@ #!/bin/sh -# create a ssh-key pair in the current folder +# ------------------------------------------------------------ +# create-and-iso +# +# shell script to create SSH key pairs and place them inisde an ISO image +# +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology +# +# +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # and create a ISO image with it +# ------------------------------------------------------------ VM_NAME=$(basename "$(pwd)") echo ${VM_NAME} diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/cygwin.py --- a/OpenSecurity/bin/cygwin.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/cygwin.py Wed Oct 29 15:18:22 2014 +0100 @@ -9,24 +9,33 @@ # Autor: Mihai Bartha, # Oliver Maurhart, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/download-image.pyw --- a/OpenSecurity/bin/download-image.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/download-image.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -6,26 +6,33 @@ # # download the initial OsecVM.ova image # -# Autor: Oliver Maurhart, -# -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/download_initial_image.sh --- a/OpenSecurity/bin/download_initial_image.sh Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/download_initial_image.sh Wed Oct 29 15:18:22 2014 +0100 @@ -1,13 +1,40 @@ #!/bin/bash # ------------------------------------------------------------ +# download_initial_image.sh +# # download initial VM for # -# OpenSecurity V0.2.10 -# -# (C)opyright 2014, AIT Austrian Instiitute of Technology +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology +# +# +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ + # ------------------------------------------------------------ # code diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/environment.py --- a/OpenSecurity/bin/environment.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/environment.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/initial_vm.sh --- a/OpenSecurity/bin/initial_vm.sh Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/initial_vm.sh Wed Oct 29 15:18:22 2014 +0100 @@ -3,8 +3,6 @@ # ------------------------------------------------------------ # install the initial VM for # -# OpenSecurity V0.2.10 -# # This has been originally a Windows only BAT file. # # ... but coding this makes your head hurt and @@ -12,7 +10,33 @@ # software to the world relying on CMD.exe is an act # against humanity and should be punished by jail. # -# (C)opyright 2014, AIT Austrian Instiitute of Technology +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology +# +# +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurity_client_restful_server.py --- a/OpenSecurity/bin/opensecurity_client_restful_server.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurity_client_restful_server.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurity_dialog.pyw --- a/OpenSecurity/bin/opensecurity_dialog.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurity_dialog.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2013, 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurity_service.pyw --- a/OpenSecurity/bin/opensecurity_service.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurity_service.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurity_tray.pyw --- a/OpenSecurity/bin/opensecurity_tray.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurity_tray.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -7,24 +7,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurity_util.py --- a/OpenSecurity/bin/opensecurity_util.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurity_util.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Mihai Bartha, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/opensecurityd.pyw --- a/OpenSecurity/bin/opensecurityd.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/opensecurityd.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -9,24 +9,33 @@ # Autor: Oliver Maurhart, # Mihai Bartha, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/proxy_getter.py --- a/OpenSecurity/bin/proxy_getter.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/proxy_getter.py Wed Oct 29 15:18:22 2014 +0100 @@ -1,3 +1,39 @@ +# ------------------------------------------------------------ +# proxy_getter +# +# Aquire the correct proxy settings of the current machine +# +# Autor: Mihai Bartha, +# +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology +# +# +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ------------------------------------------------------------ + import socket import os import httplib @@ -102,4 +138,4 @@ return {'ProxyServer': proxies['ProxyServer']} return {'ProxyServer': reg_entries['ProxyServer']} - return None \ No newline at end of file + return None diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/start_browsing.pyw --- a/OpenSecurity/bin/start_browsing.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/start_browsing.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -4,25 +4,35 @@ # directly start the browsing # # Autor: Oliver Maurhart, +# Mihai Bartha, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/terminate_client_tray.pyw --- a/OpenSecurity/bin/terminate_client_tray.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/terminate_client_tray.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -5,24 +5,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/test_vmmanager.pyw --- a/OpenSecurity/bin/test_vmmanager.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/test_vmmanager.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -2,30 +2,39 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -# opensecurityd +# test_vmmanger +# +# test the open security vmmanager # -# the opensecurityd as RESTful server -# # Autor: Mihai Bartha, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ @@ -227,4 +236,4 @@ #cmd = "c:\\cygwin64\\bin\\bash.exe --login -c \"/bin/ls\"" - #man.execute(cmd) \ No newline at end of file + #man.execute(cmd) diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/__init__.py --- a/OpenSecurity/bin/ui/__init__.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/__init__.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/about_dialog.py --- a/OpenSecurity/bin/ui/about_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/about_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/configure_dialog.py --- a/OpenSecurity/bin/ui/configure_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/configure_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/credentials_dialog.py --- a/OpenSecurity/bin/ui/credentials_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/credentials_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/format_drive_dialog.py --- a/OpenSecurity/bin/ui/format_drive_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/format_drive_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/keyfile_dialog.py --- a/OpenSecurity/bin/ui/keyfile_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/keyfile_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/launch_dialog.py --- a/OpenSecurity/bin/ui/launch_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/launch_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/notification_dialog.py --- a/OpenSecurity/bin/ui/notification_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/notification_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/ui/password_dialog.py --- a/OpenSecurity/bin/ui/password_dialog.py Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/ui/password_dialog.py Wed Oct 29 15:18:22 2014 +0100 @@ -8,24 +8,33 @@ # # Autor: Oliver Maurhart, # -# Copyright (C) 2014 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ diff -r bfac95f9ac41 -r d7ef04254e9c OpenSecurity/bin/vmmanager.pyw --- a/OpenSecurity/bin/vmmanager.pyw Wed Oct 29 15:02:42 2014 +0100 +++ b/OpenSecurity/bin/vmmanager.pyw Wed Oct 29 15:18:22 2014 +0100 @@ -2,30 +2,39 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -# opensecurityd +# the VMManager # -# the opensecurityd as RESTful server +# management of the Virtual Machines # # Autor: Mihai Bartha, # -# Copyright (C) 2013 AIT Austrian Institute of Technology -# AIT Austrian Institute of Technology GmbH -# Donau-City-Strasse 1 | 1220 Vienna | Austria -# http://www.ait.ac.at -# -# 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. +# Copyright 2013-2014 X-Net and AIT Austrian Institute of Technology # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# X-Net Services GmbH +# Elisabethstrasse 1 +# 4020 Linz +# AUSTRIA +# https://www.x-net.at +# +# AIT Austrian Institute of Technology +# Donau City Strasse 1 +# 1220 Wien +# AUSTRIA +# http://www.ait.ac.at +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # ------------------------------------------------------------ @@ -1197,4 +1206,4 @@ self.vmm.updateTemplate() except: import_logger.info("Initial import failed. Refer to service log for details.") - self.vmm.start(force=True) \ No newline at end of file + self.vmm.start(force=True)