Skip to content

Commit b59f634

Browse files
tux-mindtux-mind
committed
Merge branch 'release'
2 parents 01dfa87 + 00416f7 commit b59f634

File tree

88 files changed

+3455
-2466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3455
-2466
lines changed

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,13 @@ tmp/**/*
4040
*.swp
4141
*~.nib
4242
*~
43-
local.properties
4443
project.properties
4544
proguard/
4645
.classpath
4746
.settings/
4847
.loadpath
4948
actionbarsherlock/build/
5049
dSploit/build/
51-
.gradle/
52-
.idea/workspace.xml
53-
5450
# External tool builders
5551
.externalToolBuilders/
5652

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4+
jcenter()
45
mavenCentral()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.1.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
89
}
910
}
1011

1112
allprojects {
1213
repositories {
14+
jcenter()
1315
mavenCentral()
1416
}
1517
}

‎cSploit/AndroidManifest.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<!-- suppress AndroidDomInspection -->
4444
<service
45-
android:name=".core.UpdateService"
45+
android:name=".services.UpdateService"
4646
android:enabled="true" />
4747

4848
<service
@@ -111,6 +111,10 @@
111111
android:name=".plugins.mitm.PasswordSniffer"
112112
android:configChanges="orientation|screenSize"
113113
android:label="@string/title_activity_main" />
114+
<activity
115+
android:name=".plugins.mitm.DNSSpoofing"
116+
android:configChanges="orientation|screenSize"
117+
android:label="@string/title_activity_main" />
114118
<activity
115119
android:name=".plugins.mitm.hijacker.Hijacker"
116120
android:configChanges="orientation|screenSize"
@@ -127,6 +131,11 @@
127131
android:name=".plugins.PacketForger"
128132
android:configChanges="orientation|screenSize"
129133
android:label="@string/title_activity_main" />
134+
<activity
135+
android:name=".gui.FileEdit"
136+
android:label="@string/title_activity_main"
137+
android:parentActivityName=".plugins.mitm.PasswordSniffer" >
138+
</activity>
130139
</application>
131140

132141
</manifest>

‎cSploit/assets/csploit.p12‎

4.05 KB
Binary file not shown.

‎cSploit/assets/dsploit.keystore‎

-1.6 KB
Binary file not shown.

‎cSploit/build.gradle‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
buildscript {
22
repositories {
3+
jcenter()
34
mavenCentral()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.2.0-beta1'
7+
classpath 'com.android.tools.build:gradle:1.4.0-beta3'
78
}
89
}
910

@@ -13,31 +14,28 @@ def getDate() {
1314

1415
allprojects {
1516
repositories {
17+
jcenter()
1618
mavenCentral()
1719
}
1820
}
1921
apply plugin: 'com.android.application'
2022

2123
dependencies {
22-
compile 'com.android.support:support-v4:22.0.0'
23-
compile 'com.android.support:appcompat-v7:22.0.0'
24-
compile 'org.apache.commons:commons-compress:1.9'
25-
compile 'org.apache.commons:commons-compress:1.9:sources'
24+
compile 'com.android.support:support-v4:23.0.1'
25+
compile 'com.android.support:appcompat-v7:23.0.1'
26+
compile 'org.apache.commons:commons-compress:1.10'
2627
compile 'commons-net:commons-net:3.3'
27-
compile 'junit:junit:4.12'
28-
compile 'joda-time:joda-time:2.7'
29-
compile 'com.github.zafarkhaja:java-semver:0.8.0'
30-
compile 'com.sksamuel.diff:diff:1.1.11'
31-
compile 'org.unbescape:unbescape:1.1.0.RELEASE'
32-
compile 'org.msgpack:msgpack:0.6.11'
28+
compile 'com.github.zafarkhaja:java-semver:0.9.0'
29+
compile 'org.unbescape:unbescape:1.1.1.RELEASE'
30+
compile 'org.msgpack:msgpack:0.6.12'
3331
compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
34-
compile 'org.tukaani:xz:1.0'
35-
compile 'ch.acra:acra:4.6.1'
32+
compile 'org.tukaani:xz:1.5'
33+
compile 'ch.acra:acra:4.6.2'
3634
}
3735

3836
android {
39-
compileSdkVersion 22
40-
buildToolsVersion "22.0.1"
37+
compileSdkVersion 23
38+
buildToolsVersion '23.0.1'
4139

4240
compileOptions {
4341
sourceCompatibility JavaVersion.VERSION_1_7
@@ -53,7 +51,14 @@ android {
5351
minSdkVersion 9
5452
targetSdkVersion 22
5553
versionCode 1
56-
versionName "1.5.4"
54+
versionName "1.6.0-rc.1"
55+
}
56+
57+
lintOptions {
58+
if (System.getenv("NIGHTLY_BUILD")) {
59+
checkReleaseBuilds false
60+
}
61+
abortOnError false
5762
}
5863

5964
signingConfigs {
@@ -64,6 +69,7 @@ android {
6469
keyAlias = System.getenv("KEYSTORE_ALIAS")
6570
keyPassword = System.getenv("KEYSTORE_ALIAS_PWD")
6671
}
72+
return true
6773
}
6874
}
6975

@@ -83,6 +89,7 @@ android {
8389
if (System.getenv("KEYSTORE_FILE") != null) {
8490
signingConfig signingConfigs.release
8591
}
92+
return true
8693
}
8794
}
8895

‎cSploit/jni‎

‎cSploit/res/layout/actions_list_item.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
android:orientation="horizontal"
77
android:background="@drawable/card_background"
88
android:showDividers="none"
9-
android:layout_marginBottom="8dp">
9+
android:layout_marginBottom="8dp"
10+
android:translationZ="8dp">
1011

1112
<LinearLayout
1213
android:layout_height="wrap_content"
@@ -20,9 +21,10 @@
2021
<LinearLayout
2122
android:layout_width="0dp"
2223
android:layout_weight="10"
23-
android:layout_marginRight="8dp"
2424
android:layout_height="match_parent"
25-
android:orientation="vertical">
25+
android:orientation="vertical"
26+
android:layout_margin="8dp"
27+
android:gravity="center">
2628

2729
<ImageView
2830
android:id="@+id/actionIcon"

‎cSploit/res/layout/file_edit.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
3+
android:focusable="true" android:focusableInTouchMode="true"
4+
android:layout_height="match_parent"
5+
tools:context="org.csploit.android.gui.FileEdit">
6+
7+
<Button
8+
android:layout_width="wrap_content"
9+
android:layout_height="wrap_content"
10+
android:text="@string/save"
11+
android:id="@+id/cmdSave"
12+
android:layout_alignParentBottom="true"
13+
android:layout_alignParentLeft="true"
14+
android:layout_alignParentStart="true"
15+
android:layout_alignParentRight="true"
16+
android:layout_alignParentEnd="true" />
17+
18+
<EditText
19+
android:layout_width="wrap_content"
20+
android:layout_height="wrap_content"
21+
android:inputType="textMultiLine"
22+
android:ems="10"
23+
android:id="@+id/fileText"
24+
android:layout_alignParentRight="true"
25+
android:layout_alignParentEnd="true"
26+
android:layout_alignParentLeft="true"
27+
android:layout_alignParentStart="true"
28+
android:layout_above="@+id/cmdSave"
29+
android:scrollbars="vertical|horizontal"
30+
android:scrollHorizontally="true"
31+
android:editable="true"
32+
android:layout_alignParentTop="true" />
33+
</RelativeLayout>

‎cSploit/res/layout/plugin_mitm_dns_spoofing.xml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:focusable="true" android:focusableInTouchMode="true"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:padding="6dp">
6+
7+
<ToggleButton
8+
android:id="@+id/sniffToggleButton"
9+
android:layout_width="wrap_content"
10+
android:layout_height="wrap_content"
11+
android:text="@string/toggle_button"
12+
android:textOff="Start"
13+
android:textOn="Stop"
14+
android:paddingLeft="24dp"
15+
android:paddingRight="24dp"
16+
android:textAllCaps="true"
17+
android:fontFamily="sans-serif-condensed"/>
18+
19+
<ProgressBar
20+
android:id="@+id/sniffActivity"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_alignParentRight="true"
24+
android:layout_alignTop="@+id/sniffToggleButton"
25+
android:visibility="invisible"/>
26+
27+
<View
28+
android:id="@+id/separator"
29+
android:layout_width="fill_parent"
30+
android:layout_height="1dp"
31+
android:layout_marginTop="8dp"
32+
android:layout_marginBottom="8dp"
33+
android:layout_below="@+id/sniffToggleButton"
34+
android:background="@android:color/darker_gray"/>
35+
36+
<Button
37+
android:layout_width="wrap_content"
38+
android:layout_height="wrap_content"
39+
android:text="Save"
40+
android:id="@+id/cmd_save"
41+
android:layout_alignParentBottom="true"
42+
android:layout_alignParentLeft="true"
43+
android:layout_alignParentStart="true"
44+
android:layout_alignParentRight="true"
45+
android:layout_alignParentEnd="true" />
46+
47+
<EditText
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:inputType="textMultiLine"
51+
android:ems="10"
52+
android:id="@+id/textViewDNSList"
53+
android:layout_alignTop="@+id/separator"
54+
android:layout_alignParentLeft="true"
55+
android:layout_alignParentStart="true"
56+
android:layout_above="@+id/cmd_save"
57+
android:layout_alignParentRight="true"
58+
android:layout_alignParentEnd="true"
59+
android:scrollbars="vertical|horizontal"
60+
android:scrollHorizontally="true"
61+
android:editable="true" />
62+
63+
</RelativeLayout>

0 commit comments

Comments
 (0)