Skip to content

Commit a015df5

Browse files
ajinabrahamajinabraham
authored
[4.2.7] Updates (#2462)
Bump to google fork of baksmali 3.0.8 IPA: Graceful handling of plist dump exception
1 parent af49985 commit a015df5

File tree

6 files changed

+290
-21
lines changed

6 files changed

+290
-21
lines changed

‎LICENSES/backsmali.txt

+282-17
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,294 @@
1-
The BSD 3-Clause License
2-
The following is a BSD 3-Clause ("BSD New" or "BSD Simplified") license template. To generate your own license, change the values of OWNER, ORGANIZATION and YEAR from their original values as given here, and substitute your own.
1+
The majority of smali/baksmali is written and copyrighted by me (Ben Gruver)
2+
and released under the following license:
33

4-
Note: You may omit clause 3 and still be OSD-conformant. Despite its colloquial name "BSD New", this is not the newest version of the BSD license; it was followed by the even newer BSD-2-Clause version, sometimes known as the "Simplified BSD License". On January 9th, 2008 the OSI Board approved BSD-2-Clause, which is used by FreeBSD and others. It omits the final "no-endorsement" clause and is thus roughly equivalent to the MIT License.
4+
*******************************************************************************
5+
Copyright (c) 2010 Ben Gruver (JesusFreke)
6+
All rights reserved.
57

6-
Historical Background: The original license used on BSD Unix had four clauses. The advertising clause (the third of four clauses) required you to acknowledge use of U.C. Berkeley code in your advertising of any product using that code. It was officially rescinded by the Director of the Office of Technology Licensing of the University of California on July 22nd, 1999. He states that clause 3 is "hereby deleted in its entirety." The four clause license has not been approved by OSI. The license below does not contain the advertising clause.
8+
Redistribution and use in source and binary forms, with or without
9+
modification, are permitted provided that the following conditions
10+
are met:
11+
1. Redistributions of source code must retain the above copyright
12+
notice, this list of conditions and the following disclaimer.
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in the
15+
documentation and/or other materials provided with the distribution.
16+
3. The name of the author may not be used to endorse or promote products
17+
derived from this software without specific prior written permission.
718

8-
This prelude is not part of the license.
19+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
20+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
21+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
24+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*******************************************************************************
930

10-
<OWNER> = Regents of the University of California
11-
<ORGANIZATION> = University of California, Berkeley
12-
<YEAR> = 1998
1331

14-
In the original BSD license, the occurrence of "copyright holder" in the 3rd clause read "ORGANIZATION", placeholder for "University of California". In the original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
32+
Unless otherwise stated in the code/commit message, any changes with the
33+
committer of [email protected] or [email protected] is copyrighted by
34+
Google LLC and released under the following license:
1535

16-
Here is the license template:
36+
*******************************************************************************
37+
Copyright 2011, Google LLC
1738

18-
Copyright (c) <YEAR>, <OWNER>
19-
All rights reserved.
39+
Redistribution and use in source and binary forms, with or without
40+
modification, are permitted provided that the following conditions are
41+
met:
42+
43+
* Redistributions of source code must retain the above copyright
44+
notice, this list of conditions and the following disclaimer.
45+
* Redistributions in binary form must reproduce the above
46+
copyright notice, this list of conditions and the following disclaimer
47+
in the documentation and/or other materials provided with the
48+
distribution.
49+
* Neither the name of Google LLC nor the names of its
50+
contributors may be used to endorse or promote products derived from
51+
this software without specific prior written permission.
52+
53+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
54+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
55+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
56+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
57+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
58+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
59+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
60+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
61+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
62+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
63+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
64+
*******************************************************************************
65+
66+
67+
Various portions of the code are taken from the Android Open Source Project,
68+
and are used in accordance with the following license:
69+
70+
*******************************************************************************
71+
Copyright (C) 2007 The Android Open Source Project
72+
73+
Licensed under the Apache License, Version 2.0 (the "License");
74+
you may not use this file except in compliance with the License.
75+
You may obtain a copy of the License at
76+
77+
http://www.apache.org/licenses/LICENSE-2.0
78+
79+
Unless required by applicable law or agreed to in writing, software
80+
distributed under the License is distributed on an "AS IS" BASIS,
81+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
82+
See the License for the specific language governing permissions and
83+
limitations under the License.
84+
*******************************************************************************
85+
86+
Various portions of the code are taken from https://github.com/google/guava,
87+
and are used in accordance with the following license:
88+
89+
Content of http://www.apache.org/licenses/LICENSE-2.0:
90+
91+
*******************************************************************************
92+
93+
94+
Apache License
95+
Version 2.0, January 2004
96+
http://www.apache.org/licenses/
97+
98+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
99+
100+
1. Definitions.
101+
102+
"License" shall mean the terms and conditions for use, reproduction,
103+
and distribution as defined by Sections 1 through 9 of this document.
104+
105+
"Licensor" shall mean the copyright owner or entity authorized by
106+
the copyright owner that is granting the License.
107+
108+
"Legal Entity" shall mean the union of the acting entity and all
109+
other entities that control, are controlled by, or are under common
110+
control with that entity. For the purposes of this definition,
111+
"control" means (i) the power, direct or indirect, to cause the
112+
direction or management of such entity, whether by contract or
113+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
114+
outstanding shares, or (iii) beneficial ownership of such entity.
115+
116+
"You" (or "Your") shall mean an individual or Legal Entity
117+
exercising permissions granted by this License.
118+
119+
"Source" form shall mean the preferred form for making modifications,
120+
including but not limited to software source code, documentation
121+
source, and configuration files.
122+
123+
"Object" form shall mean any form resulting from mechanical
124+
transformation or translation of a Source form, including but
125+
not limited to compiled object code, generated documentation,
126+
and conversions to other media types.
127+
128+
"Work" shall mean the work of authorship, whether in Source or
129+
Object form, made available under the License, as indicated by a
130+
copyright notice that is included in or attached to the work
131+
(an example is provided in the Appendix below).
132+
133+
"Derivative Works" shall mean any work, whether in Source or Object
134+
form, that is based on (or derived from) the Work and for which the
135+
editorial revisions, annotations, elaborations, or other modifications
136+
represent, as a whole, an original work of authorship. For the purposes
137+
of this License, Derivative Works shall not include works that remain
138+
separable from, or merely link (or bind by name) to the interfaces of,
139+
the Work and Derivative Works thereof.
140+
141+
"Contribution" shall mean any work of authorship, including
142+
the original version of the Work and any modifications or additions
143+
to that Work or Derivative Works thereof, that is intentionally
144+
submitted to Licensor for inclusion in the Work by the copyright owner
145+
or by an individual or Legal Entity authorized to submit on behalf of
146+
the copyright owner. For the purposes of this definition, "submitted"
147+
means any form of electronic, verbal, or written communication sent
148+
to the Licensor or its representatives, including but not limited to
149+
communication on electronic mailing lists, source code control systems,
150+
and issue tracking systems that are managed by, or on behalf of, the
151+
Licensor for the purpose of discussing and improving the Work, but
152+
excluding communication that is conspicuously marked or otherwise
153+
designated in writing by the copyright owner as "Not a Contribution."
154+
155+
"Contributor" shall mean Licensor and any individual or Legal Entity
156+
on behalf of whom a Contribution has been received by Licensor and
157+
subsequently incorporated within the Work.
158+
159+
2. Grant of Copyright License. Subject to the terms and conditions of
160+
this License, each Contributor hereby grants to You a perpetual,
161+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
162+
copyright license to reproduce, prepare Derivative Works of,
163+
publicly display, publicly perform, sublicense, and distribute the
164+
Work and such Derivative Works in Source or Object form.
165+
166+
3. Grant of Patent License. Subject to the terms and conditions of
167+
this License, each Contributor hereby grants to You a perpetual,
168+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
169+
(except as stated in this section) patent license to make, have made,
170+
use, offer to sell, sell, import, and otherwise transfer the Work,
171+
where such license applies only to those patent claims licensable
172+
by such Contributor that are necessarily infringed by their
173+
Contribution(s) alone or by combination of their Contribution(s)
174+
with the Work to which such Contribution(s) was submitted. If You
175+
institute patent litigation against any entity (including a
176+
cross-claim or counterclaim in a lawsuit) alleging that the Work
177+
or a Contribution incorporated within the Work constitutes direct
178+
or contributory patent infringement, then any patent licenses
179+
granted to You under this License for that Work shall terminate
180+
as of the date such litigation is filed.
181+
182+
4. Redistribution. You may reproduce and distribute copies of the
183+
Work or Derivative Works thereof in any medium, with or without
184+
modifications, and in Source or Object form, provided that You
185+
meet the following conditions:
186+
187+
(a) You must give any other recipients of the Work or
188+
Derivative Works a copy of this License; and
189+
190+
(b) You must cause any modified files to carry prominent notices
191+
stating that You changed the files; and
192+
193+
(c) You must retain, in the Source form of any Derivative Works
194+
that You distribute, all copyright, patent, trademark, and
195+
attribution notices from the Source form of the Work,
196+
excluding those notices that do not pertain to any part of
197+
the Derivative Works; and
198+
199+
(d) If the Work includes a "NOTICE" text file as part of its
200+
distribution, then any Derivative Works that You distribute must
201+
include a readable copy of the attribution notices contained
202+
within such NOTICE file, excluding those notices that do not
203+
pertain to any part of the Derivative Works, in at least one
204+
of the following places: within a NOTICE text file distributed
205+
as part of the Derivative Works; within the Source form or
206+
documentation, if provided along with the Derivative Works; or,
207+
within a display generated by the Derivative Works, if and
208+
wherever such third-party notices normally appear. The contents
209+
of the NOTICE file are for informational purposes only and
210+
do not modify the License. You may add Your own attribution
211+
notices within Derivative Works that You distribute, alongside
212+
or as an addendum to the NOTICE text from the Work, provided
213+
that such additional attribution notices cannot be construed
214+
as modifying the License.
215+
216+
You may add Your own copyright statement to Your modifications and
217+
may provide additional or different license terms and conditions
218+
for use, reproduction, or distribution of Your modifications, or
219+
for any such Derivative Works as a whole, provided Your use,
220+
reproduction, and distribution of the Work otherwise complies with
221+
the conditions stated in this License.
222+
223+
5. Submission of Contributions. Unless You explicitly state otherwise,
224+
any Contribution intentionally submitted for inclusion in the Work
225+
by You to the Licensor shall be under the terms and conditions of
226+
this License, without any additional terms or conditions.
227+
Notwithstanding the above, nothing herein shall supersede or modify
228+
the terms of any separate license agreement you may have executed
229+
with Licensor regarding such Contributions.
230+
231+
6. Trademarks. This License does not grant permission to use the trade
232+
names, trademarks, service marks, or product names of the Licensor,
233+
except as required for reasonable and customary use in describing the
234+
origin of the Work and reproducing the content of the NOTICE file.
235+
236+
7. Disclaimer of Warranty. Unless required by applicable law or
237+
agreed to in writing, Licensor provides the Work (and each
238+
Contributor provides its Contributions) on an "AS IS" BASIS,
239+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
240+
implied, including, without limitation, any warranties or conditions
241+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
242+
PARTICULAR PURPOSE. You are solely responsible for determining the
243+
appropriateness of using or redistributing the Work and assume any
244+
risks associated with Your exercise of permissions under this License.
245+
246+
8. Limitation of Liability. In no event and under no legal theory,
247+
whether in tort (including negligence), contract, or otherwise,
248+
unless required by applicable law (such as deliberate and grossly
249+
negligent acts) or agreed to in writing, shall any Contributor be
250+
liable to You for damages, including any direct, indirect, special,
251+
incidental, or consequential damages of any character arising as a
252+
result of this License or out of the use or inability to use the
253+
Work (including but not limited to damages for loss of goodwill,
254+
work stoppage, computer failure or malfunction, or any and all
255+
other commercial damages or losses), even if such Contributor
256+
has been advised of the possibility of such damages.
257+
258+
9. Accepting Warranty or Additional Liability. While redistributing
259+
the Work or Derivative Works thereof, You may choose to offer,
260+
and charge a fee for, acceptance of support, warranty, indemnity,
261+
or other liability obligations and/or rights consistent with this
262+
License. However, in accepting such obligations, You may act only
263+
on Your own behalf and on Your sole responsibility, not on behalf
264+
of any other Contributor, and only if You agree to indemnify,
265+
defend, and hold each Contributor harmless for any liability
266+
incurred by, or claims asserted against, such Contributor by reason
267+
of your accepting any such warranty or additional liability.
268+
269+
END OF TERMS AND CONDITIONS
270+
271+
APPENDIX: How to apply the Apache License to your work.
20272

21-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
273+
To apply the Apache License to your work, attach the following
274+
boilerplate notice, with the fields enclosed by brackets "[]"
275+
replaced with your own identifying information. (Don't include
276+
the brackets!) The text should be enclosed in the appropriate
277+
comment syntax for the file format. We also recommend that a
278+
file or class name and description of purpose be included on the
279+
same "printed page" as the copyright notice for easier
280+
identification within third-party archives.
22281

23-
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
282+
Copyright 2007 The Android Open Source Project
24283

25-
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
284+
Licensed under the Apache License, Version 2.0 (the "License");
285+
you may not use this file except in compliance with the License.
286+
You may obtain a copy of the License at
26287

27-
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
288+
http://www.apache.org/licenses/LICENSE-2.0
28289

29-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
290+
Unless required by applicable law or agreed to in writing, software
291+
distributed under the License is distributed on an "AS IS" BASIS,
292+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
293+
See the License for the specific language governing permissions and
294+
limitations under the License.

‎mobsf/MalwareAnalyzer/views/Trackers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def get_embedded_classes(self):
144144
and is_file_exists(settings.BACKSMALI_BINARY)):
145145
bs_path = settings.BACKSMALI_BINARY
146146
else:
147-
bs_path = os.path.join(self.tools_dir, 'baksmali-2.5.2.jar')
147+
bs_path = os.path.join(self.tools_dir, 'baksmali-3.0.8-dev-fat.jar')
148148
args = [find_java_binary(), '-jar',
149149
bs_path, 'list', 'classes', dex_file]
150150
try:

‎mobsf/StaticAnalyzer/tools/baksmali-2.5.2.jar

-1.22 MB
Binary file not shown.

‎mobsf/StaticAnalyzer/tools/baksmali-3.0.8-dev-fat.jar

4.52 MB
Binary file not shown.

0 commit comments

Comments
 (0)