From 5890bb04dde6c2445f7409ee6b6add90555409ce Mon Sep 17 00:00:00 2001 From: huobb0 Date: Thu, 4 Feb 2021 12:51:45 +0100 Subject: [PATCH] new certs added --- .idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes .idea/codeStyles/Project.xml | 137 ++++++++++++++---- .idea/gradle.xml | 2 + .idea/jarRepositories.xml | 45 ++++++ .idea/markdown-navigator-enh.xml | 10 ++ .idea/markdown-navigator.xml | 62 ++++++++ .idea/misc.xml | 20 ++- .../MainActivity.java | 22 +-- app/src/main/res/layout/activity_main.xml | 7 - app/src/main/res/raw/cacustomca.pem | 22 --- app/src/main/res/raw/caselfsigned.pem | 22 --- app/src/main/res/raw/customca.crt | 33 +++++ app/src/main/res/raw/dstroot.pem | 20 +++ 13 files changed, 307 insertions(+), 95 deletions(-) create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/markdown-navigator-enh.xml create mode 100644 .idea/markdown-navigator.xml delete mode 100644 app/src/main/res/raw/cacustomca.pem delete mode 100644 app/src/main/res/raw/caselfsigned.pem create mode 100644 app/src/main/res/raw/customca.crt create mode 100644 app/src/main/res/raw/dstroot.pem diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ace914c7cd94d26fbc36b1c9a2904e6b994bd5bc..331663045605af50f7b2ca89be2868cece128f81 100644 GIT binary patch delta 16 YcmbQqGLvP(bk_2m8$Hz<=hQL+063Ng^Z)<= delta 16 YcmbQqGLvP(bk^ivucGxE=hQL+05xz1jQ{`u diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 30aa626..f24a632 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,29 +1,116 @@ - - - - - - - - - - + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + - + diff --git a/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java b/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java index aae7569..d3caa5b 100644 --- a/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java +++ b/app/src/main/java/com/example/zsombor/networksecurityconfigdemo/MainActivity.java @@ -68,35 +68,27 @@ protected void onCreate(Bundle savedInstanceState) { downloadButton = (Button) findViewById(R.id.button); editTextField = (EditText) findViewById(R.id.editText); - selfSignedButton = (RadioButton) findViewById(R.id.radio_pirates); letsEncryptButton = (RadioButton)findViewById(R.id.radio_ninjas); customCAButton = (RadioButton) findViewById(R.id.radio_ninjas2); plainTextButton = (RadioButton) findViewById(R.id.radio_ninjas3); - selfSignedButton.setOnClickListener(new View.OnClickListener(){ - public void onClick(View arg0){ - editTextField.setText("Self signed cert at https://secure.singleframesecurity.net:444"); - select = 4; - } - }); - letsEncryptButton.setOnClickListener(new View.OnClickListener(){ public void onClick(View arg0){ - editTextField.setText("Proper cert at https://singleframesecurity.net:443"); + editTextField.setText("Proper cert at https://zs.labs.defdev.eu:443"); select = 3; } }); customCAButton.setOnClickListener(new View.OnClickListener(){ public void onClick(View arg0){ - editTextField.setText("Custom CA pinned at https://test.singleframesecurity.net:442"); + editTextField.setText("Custom CA pinned at https://zs.labs.defdev.eu:444"); select = 2; } }); plainTextButton.setOnClickListener(new View.OnClickListener(){ public void onClick(View arg0){ - editTextField.setText("Plain text on http://singleframesecurity.net"); + editTextField.setText("Plain text on http://zs.labs.defdev.eu"); select = 1; } }); @@ -106,13 +98,11 @@ public void onClick(View arg0) { try { AsyncTask rt = new ReadTask(); if(select == 1){ - rt.execute("http://singleframesecurity.net/success.html"); + rt.execute("http://zs.labs.defdev.eu/success.html"); } else if (select == 2){ - rt.execute("https://test.singleframesecurity.net:442/success.html"); + rt.execute("https://zs.labs.defdev.eu:444/success.html"); } else if (select == 3){ - rt.execute("https://singleframesecurity.net/success.html"); - } else if (select == 4) { - rt.execute("https://secure.singleframesecurity.net:444/success.html"); + rt.execute("https://zs.labs.defdev.eu/success.html"); } String back = rt.get(); editTextField.setText(back); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7c859ff..bc0b95a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -47,13 +47,6 @@ app:layout_constraintTop_toBottomOf="@+id/editText" tools:layout_editor_absoluteX="0dp"> - -