Skip to content

Commit

Permalink
More code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
kjamroz-bt committed Jul 1, 2019
1 parent e7da1d6 commit b8c6fe9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
8 changes: 4 additions & 4 deletions MachObfuscator/Controller/Obfuscator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ class Obfuscator {
private let methTypeObfuscation: Bool

private let swiftReflectionObfuscation: Bool

private let obfuscableFilesFilter : ObfuscableFilesFilter

init(directoryURL: URL, mangler: SymbolMangling, methTypeObfuscation: Bool = false, swiftReflectionObfuscation: Bool = false, obfuscableFilesFilter : ObfuscableFilesFilter = ObfuscableFilesFilter.defaultObfuscableFilesFilter()) {
private let obfuscableFilesFilter: ObfuscableFilesFilter

init(directoryURL: URL, mangler: SymbolMangling, methTypeObfuscation: Bool = false, swiftReflectionObfuscation: Bool = false, obfuscableFilesFilter: ObfuscableFilesFilter = ObfuscableFilesFilter.defaultObfuscableFilesFilter()) {
self.directoryURL = directoryURL
self.mangler = mangler
self.methTypeObfuscation = methTypeObfuscation
Expand All @@ -28,7 +28,7 @@ class Obfuscator {
obfuscableFilesFilter: obfuscableFilesFilter)
LOGGER.info("\(paths.obfuscableImages.count) obfuscable images")
LOGGER.debug("Obfuscable images:")
paths.obfuscableImages.forEach({ (u) in LOGGER.debug(u.absoluteString) })
paths.obfuscableImages.forEach { u in LOGGER.debug(u.absoluteString) }
LOGGER.info("\(paths.nibs.count) obfuscable NIBs")

LOGGER.info("Collecting symbols...")
Expand Down
13 changes: 6 additions & 7 deletions MachObfuscator/DependencyAnalysis/ObfuscableFilesFilter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extension ObfuscableFilesFilter {
self.isObfuscable(url) && other.isObfuscable(url)
}
}

static func defaultObfuscableFilesFilter() -> ObfuscableFilesFilter {
// > Swift apps no longer include dynamically linked libraries
// > for the Swift standard library and Swift SDK overlays in
Expand All @@ -19,30 +19,29 @@ extension ObfuscableFilesFilter {
// -- https://developer.apple.com/documentation/xcode_release_notes/xcode_10_2_beta_release_notes/swift_5_release_notes_for_xcode_10_2_beta
return skipSwiftLibrary()
}

static func skipSwiftLibrary() -> ObfuscableFilesFilter {
return ObfuscableFilesFilter { url in
!url.lastPathComponent.starts(with: "libswift")
}
}

static func onlyFiles(in obfuscableDirectory: URL) -> ObfuscableFilesFilter {
return ObfuscableFilesFilter { url in
obfuscableDirectory.contains(url)
}
}
static func skipFramework(framework : String) -> ObfuscableFilesFilter {

static func skipFramework(framework: String) -> ObfuscableFilesFilter {
let frameworkComponent = framework + ".framework"
return ObfuscableFilesFilter { url in
!url.pathComponents.contains(frameworkComponent)
}
}

static func skipAllFrameworks() -> ObfuscableFilesFilter {
return ObfuscableFilesFilter { url in
!url.pathComponents.contains("Frameworks")
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@ extension ObfuscationPaths {
.uniq
}
}

2 changes: 1 addition & 1 deletion MachObfuscator/Options/Options.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extension Options {
option(name: Options.newCCharPtrFromStaticString("skip-framework"), has_arg: required_argument, flag: nil, val: OptLongCases.skipFramework.rawValue),
option(name: Options.newCCharPtrFromStaticString("skip-all-frameworks"), has_arg: no_argument, flag: nil, val: OptLongCases.skipAllFrameworks.rawValue),
option(name: Options.newCCharPtrFromStaticString("mangler"), has_arg: required_argument, flag: nil, val: OptLongChars.manglerKey),
option() // { NULL, NULL, NULL, NULL }
option(), // { NULL, NULL, NULL, NULL }
]

while case let option = getopt_long(argc, unsafeArgv, "qvdhtDm:", longopts, nil), option != -1 {
Expand Down

0 comments on commit b8c6fe9

Please sign in to comment.