github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 18:41:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

OpenSSL: Minor code edits/refactoring.

Browse Source 
Former-commit-id: 5c0247772406b55a0e1e7219b83389a5ed0605f4
This commit is contained in:
Dale Visser
2015-07-07 17:48:50 -04:00
parent c214b70459
commit 30087b5e79
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/OpenSSLAnalyzer.java
View File

@@ -23,15 +23,11 @@ import org.owasp.dependencycheck.Engine;
import org.owasp.dependencycheck.analyzer.exception.AnalysisException; import org.owasp.dependencycheck.analyzer.exception.AnalysisException;
import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Confidence;
import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Dependency;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -48,16 +44,7 @@ public class OpenSSLAnalyzer extends AbstractFileTypeAnalyzer {
* Filename to analyze. All other .h files get removed from consideration. * Filename to analyze. All other .h files get removed from consideration.
*/ */
private static final String OPENSSLV_H = "opensslv.h"; private static final String OPENSSLV_H = "opensslv.h";
/**
* Used when compiling file scanning regex patterns.
*/
private static final int REGEX_OPTIONS = Pattern.DOTALL
| Pattern.CASE_INSENSITIVE;
/**
* The logger.
*/
private static final Logger LOGGER = LoggerFactory
.getLogger(OpenSSLAnalyzer.class);
/** /**
* Filename extensions for files to be analyzed. * Filename extensions for files to be analyzed.
*/ */
@@ -68,7 +55,8 @@ public class OpenSSLAnalyzer extends AbstractFileTypeAnalyzer {
*/ */
private static final FileFilter OPENSSLV_FILTER = new NameFileFilter(OPENSSLV_H); private static final FileFilter OPENSSLV_FILTER = new NameFileFilter(OPENSSLV_H);
private static final Pattern VERSION_PATTERN = Pattern.compile( private static final Pattern VERSION_PATTERN = Pattern.compile(
"define\\s+OPENSSL_VERSION_NUMBER\\s+0x([0-9a-zA-Z]{8})L", REGEX_OPTIONS); "define\\s+OPENSSL_VERSION_NUMBER\\s+0x([0-9a-zA-Z]{8})L", Pattern.DOTALL
| Pattern.CASE_INSENSITIVE);
private static final int MAJOR_OFFSET = 28; private static final int MAJOR_OFFSET = 28;
private static final long MINOR_MASK = 0x0ff00000L; private static final long MINOR_MASK = 0x0ff00000L;
private static final int MINOR_OFFSET = 20; private static final int MINOR_OFFSET = 20;
@@ -180,7 +168,7 @@ public class OpenSSLAnalyzer extends AbstractFileTypeAnalyzer {
contents = FileUtils.readFileToString(actualFile).trim(); contents = FileUtils.readFileToString(actualFile).trim();
} catch (IOException e) { } catch (IOException e) {
throw new AnalysisException( throw new AnalysisException(
"Problem occured while reading dependency file.", e); "Problem occurred while reading dependency file.", e);
} }
return contents; return contents;
} }