Update licenses

AktivCo · Nov 7, 2018 · 28be37f · 28be37f
1 parent 85eb6a3
commit 28be37f
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 44 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015, CJSC Aktiv-Soft All rights reserved.
+Copyright (c) 2018, JSC Aktiv-Soft. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

diff --git a/LICENSE_RUS b/LICENSE_RUS
@@ -1,4 +1,4 @@
-Copyright (c) 2015, ЗАО "Актив-Софт"
+Copyright (c) 2018, АО "Актив-Софт"
 
 Разрешается повторное распространение и использование как в виде исходного кода, так и в двоичной форме, с изменениями или без, при соблюдении следующих условий:
 

diff --git a/README.mdown b/README.mdown
@@ -49,5 +49,4 @@ To create a key pair and certificate on Rutoken ECP Bluetooth follow these steps
 ## License
 
 Project source code is distributed under [New BSD license](LICENSE) if the opposite is not mentioned in the source code entity itself,
-app/src/main/java/ru/rutoken/demobank directory contains objects of copyright and distributed under commercial license of CJSC “Aktiv-Soft”, [License Agreement] (https://download.rutoken.ru/License_Agreement.pdf) (only in Russian).
-This product includes software developed by IAIK of Graz University of Technology.
+app/src/main/java/ru/rutoken/demobank directory contains objects of copyright and distributed under commercial license of JSC “Aktiv-Soft”, [License Agreement] (https://download.rutoken.ru/License_Agreement.pdf) (only in Russian).
diff --git a/README_RUS.mdown b/README_RUS.mdown
@@ -48,5 +48,4 @@
 ## Лицензия
 
 Программный код проекта распространяется по [модифицированной лицензии BSD](LICENSE_RUS), если противное не указано в файле с исходным кодом,
-содержимое папки app/src/main/java/ru/rutoken/demobank содержит объекты авторского права и распространяется по коммерческой лицензии ЗАО "Актив-Софт", [текст лицензии] (https://download.rutoken.ru/License_Agreement.pdf).
-Данный продукт содержит программное обеспечение, разработанное IAIK of Graz University of Technology.
+содержимое папки app/src/main/java/ru/rutoken/demobank содержит объекты авторского права и распространяется по коммерческой лицензии АО "Актив-Софт", [текст лицензии] (https://download.rutoken.ru/License_Agreement.pdf).
diff --git a/app/src/main/java/ru/rutoken/demobank/ExternallyDismissableActivity.java b/app/src/main/java/ru/rutoken/demobank/ExternallyDismissableActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/GuaranteedChildStartActivity.java b/app/src/main/java/ru/rutoken/demobank/GuaranteedChildStartActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/LoginActivity.java b/app/src/main/java/ru/rutoken/demobank/LoginActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/MainActivity.java b/app/src/main/java/ru/rutoken/demobank/MainActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/ManagedActivity.java b/app/src/main/java/ru/rutoken/demobank/ManagedActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/Payment.java b/app/src/main/java/ru/rutoken/demobank/Payment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/PaymentsActivity.java b/app/src/main/java/ru/rutoken/demobank/PaymentsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/Pkcs11CallerActivity.java b/app/src/main/java/ru/rutoken/demobank/Pkcs11CallerActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/demobank/TokenManagerListener.java b/app/src/main/java/ru/rutoken/demobank/TokenManagerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
+ * Copyright (c) 2018, JSC Aktiv-Soft. See https://download.rutoken.ru/License_Agreement.pdf
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/Certificate.java b/app/src/main/java/ru/rutoken/pkcs11caller/Certificate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/EventHandler.java b/app/src/main/java/ru/rutoken/pkcs11caller/EventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/EventRunnable.java b/app/src/main/java/ru/rutoken/pkcs11caller/EventRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/EventType.java b/app/src/main/java/ru/rutoken/pkcs11caller/EventType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/Pkcs11AsyncTask.java b/app/src/main/java/ru/rutoken/pkcs11caller/Pkcs11AsyncTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/Pkcs11Callback.java b/app/src/main/java/ru/rutoken/pkcs11caller/Pkcs11Callback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/RtPkcs11Library.java b/app/src/main/java/ru/rutoken/pkcs11caller/RtPkcs11Library.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/Token.java b/app/src/main/java/ru/rutoken/pkcs11caller/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/TokenManager.java b/app/src/main/java/ru/rutoken/pkcs11caller/TokenManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/Utils.java b/app/src/main/java/ru/rutoken/pkcs11caller/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/exception/CertNotFoundException.java b/app/src/main/java/ru/rutoken/pkcs11caller/exception/CertNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/exception/CertParsingException.java b/app/src/main/java/ru/rutoken/pkcs11caller/exception/CertParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/exception/KeyNotFoundException.java b/app/src/main/java/ru/rutoken/pkcs11caller/exception/KeyNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/exception/Pkcs11CallerException.java b/app/src/main/java/ru/rutoken/pkcs11caller/exception/Pkcs11CallerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/pkcs11caller/exception/Pkcs11Exception.java b/app/src/main/java/ru/rutoken/pkcs11caller/exception/Pkcs11Exception.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/utils/Pkcs11ErrorTranslator.java b/app/src/main/java/ru/rutoken/utils/Pkcs11ErrorTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/utils/TokenBatteryCharge.java b/app/src/main/java/ru/rutoken/utils/TokenBatteryCharge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/java/ru/rutoken/utils/TokenModelRecognizer.java b/app/src/main/java/ru/rutoken/utils/TokenModelRecognizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, CJSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
+ * Copyright (c) 2018, JSC Aktiv-Soft. See the LICENSE file at the top-level directory of this distribution.
  * All Rights Reserved.
  */
 

diff --git a/app/src/main/res/values/payments.xml b/app/src/main/res/values/payments.xml
@@ -33,7 +33,7 @@
     <item>@array/a10</item>
 </array>
         <string-array name ="a0">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -51,7 +51,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a1">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -69,7 +69,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a2">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -87,7 +87,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a3">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -105,7 +105,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a4">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -123,7 +123,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a5">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -141,7 +141,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a6">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -159,7 +159,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a7">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -177,7 +177,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a8">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -195,7 +195,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a9">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>
@@ -213,7 +213,7 @@
             <item>За телепатические услуги</item>
         </string-array>
         <string-array name ="a10">
-            <item>ЗАО "Актив-софт"</item>
+            <item>АО "Актив-софт"</item>
             <item>7712545785</item>
             <item>771254552</item>
             <item>40702800000012354457</item>