From 2b6d22ed949f3376f469a3731592a0464bcb3115 Mon Sep 17 00:00:00 2001 From: anonTree1417 Date: Mon, 30 Mar 2020 23:25:49 +0200 Subject: [PATCH] Modifying license headers. --- .../java/org/mian/gitnex/ssl/MTMDecision.java | 26 ++------------ .../mian/gitnex/ssl/MemorizingActivity.java | 26 ++------------ .../gitnex/ssl/MemorizingTrustManager.java | 35 +------------------ 3 files changed, 7 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java b/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java index 9eba8ee2..cb141175 100644 --- a/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java +++ b/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java @@ -1,28 +1,8 @@ -/* MemorizingTrustManager - a TrustManager which asks the user about invalid - * certificates and memorizes their decision. - * - * Copyright (c) 2010 Georg Lukas - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ package org.mian.gitnex.ssl; +/** + * Author Georg Lukas, modified by anonTree1417 + */ class MTMDecision { public final static int DECISION_INVALID = 0; public final static int DECISION_ABORT = 1; diff --git a/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java b/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java index b2da9f45..68397e84 100644 --- a/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java +++ b/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java @@ -1,26 +1,3 @@ -/* MemorizingTrustManager - a TrustManager which asks the user about invalid - * certificates and memorizes their decision. - * - * Copyright (c) 2010 Georg Lukas - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ package org.mian.gitnex.ssl; import android.app.Activity; @@ -29,6 +6,9 @@ import android.content.Intent; import android.os.Bundle; import org.mian.gitnex.R; +/** + * Author Georg Lukas, modified by anonTree1417 + */ public class MemorizingActivity extends Activity { @Override diff --git a/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java b/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java index 44f65716..fc184b5d 100644 --- a/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java +++ b/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java @@ -1,29 +1,3 @@ -/* MemorizingTrustManager - a TrustManager which asks the user about invalid - * certificates and memorizes their decision. - * - * Copyright (c) 2010 Georg Lukas - * - * MemorizingTrustManager.java contains the actual trust manager and interface - * code to create a MemorizingActivity and obtain the results. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ package org.mian.gitnex.ssl; import android.annotation.TargetApi; @@ -68,14 +42,7 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; /** - * A X509 trust manager implementation which asks the user about invalid - * certificates and memorizes their decision. - *

- * The certificate validity is checked using the system default X509 - * TrustManager, creating a query Dialog if the check fails. - *

- * WARNING: This only works if a dedicated thread is used for - * opening sockets! + * Author Georg Lukas, modified by anonTree1417 */ public class MemorizingTrustManager implements X509TrustManager { private final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";