sha
string | github
string | commit_message
string | git_diff
string | is_security
int64 |
|---|---|---|---|---|
4ce00aef84d1ff7c35f7adbbb99a6241cfda00cc
|
https://github.com/sitaramc/gitolite/commit/4ce00aef84d1ff7c35f7adbbb99a6241cfda00cc
|
security fix for optional ADC (admin-defined command) feature
Thanks to Dylan Simon for catching it...
|
diff --git a/src/gl-auth-command b/src/gl-auth-command
index 1af4232f0..f3449a59f 100755
--- a/src/gl-auth-command
+++ b/src/gl-auth-command
@@ -154,6 +154,7 @@ die "server is in slave mode; you can only fetch\n"
if ($GL_ADC_PATH and -d $GL_ADC_PATH) {
my ($cmd, @args) = split ' ', $ENV{SSH_ORIGINAL_COMMAND};
if (-x "$GL_ADC_PATH/$cmd") {
+ die "I don't like $cmd\n" if $cmd =~ /\.\./;
# yes this is rather strict, sorry.
do { die "I don't like $_\n" unless $_ =~ $ADC_CMD_ARGS_PATT } for ($cmd, @args);
&log_it("$GL_ADC_PATH/$ENV{SSH_ORIGINAL_COMMAND}");
| 1
|
4751b606fa38edc456d627140898a7ec679fcc24
|
https://github.com/libgd/libgd/commit/4751b606fa38edc456d627140898a7ec679fcc24
|
gdImageScaleTwoPass memory leak fix
Fixing memory leak in gdImageScaleTwoPass, as reported by @cmb69 and
confirmed by @vapier. This bug actually bit me in production and I'm
very thankful that it was reported with an easy fix.
Fixes #173.
|
diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c
index fcc11e6e4..f00c94622 100644
--- a/src/gd_interpolation.c
+++ b/src/gd_interpolation.c
@@ -1087,7 +1087,7 @@ gdImageScaleTwoPass(const gdImagePtr src, const unsigned int new_width,
}/* if */
if (src != tmp_im) {
- gdFree(tmp_im);
+ gdImageDestroy(tmp_im);
}/* if */
return dst;
| 1
|
1ab68415b35e1bd28e5f684d3d99f18191d6ca87
|
https://github.com/apache/uima-uimaj/commit/1ab68415b35e1bd28e5f684d3d99f18191d6ca87
|
Merge pull request #93 from apache/UIMA-6307-Centralize-Jenkins-pipelines
[UIMA-6307] Centralize Jenkins pipelines
|
diff --git a/Jenkinsfile b/Jenkinsfile
index 2867482cd..c21a47e84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,117 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-def MAVEN_VERSION = 'maven_latest'
-def JDK_VERSION = 'jdk_11_latest'
-
-pipeline {
- agent any
+@Library('uima-build-jenkins-shared-library') _
- tools {
- maven MAVEN_VERSION
- jdk JDK_VERSION
- }
-
- options {
- buildDiscarder(logRotator(
- numToKeepStr: '25',
- artifactNumToKeepStr: '5'
- ))
-
- // Seems not to be working reliably yet: https://issues.jenkins-ci.org/browse/JENKINS-48556
- // timestamps()
- }
-
- parameters {
- string(
- name: 'extraMavenArguments',
- defaultValue: "",
- description: "Extra arguments to be passed to maven (for testing)")
- }
-
- stages {
- // Display information about the build environemnt. This can be useful for debugging
- // build issues.
- stage("Build info") {
- steps {
- echo '=== Environment variables ==='
- script {
- if (isUnix()) {
- sh 'printenv'
- }
- else {
- bat 'set'
- }
- }
- }
- }
-
- // Perform a merge request build. This is a conditional stage executed with the GitLab
- // sources plugin triggers a build for a merge request. To avoid conflicts with other
- // builds, this stage should not deploy artifacts to the Maven repository server and
- // also not install them locally.
- stage("Pull request build") {
- when { branch 'PR-*' }
-
- steps {
- script {
- currentBuild.description = 'Triggered by: <a href="' + CHANGE_URL + '">' + BRANCH_NAME +
- ': ' + env.CHANGE_BRANCH + '</a> (' + env.CHANGE_AUTHOR_DISPLAY_NAME + ')'
- }
-
- withMaven(maven: MAVEN_VERSION, jdk: JDK_VERSION) {
- script {
- def mavenCommand = 'mvn ' +
- params.extraMavenArguments +
- ' -U -Dmaven.test.failure.ignore=true clean verify';
-
- if (isUnix()) {
- sh script: mavenCommand
- }
- else {
- bat script: mavenCommand
- }
- }
- }
-
- script {
- def mavenConsoleIssues = scanForIssues tool: mavenConsole()
- def javaIssues = scanForIssues tool: java()
- def javaDocIssues = scanForIssues tool: javaDoc()
- publishIssues issues: [mavenConsoleIssues, javaIssues, javaDocIssues]
- }
- }
- }
-
- // Perform a SNAPSHOT build of a main branch. This stage is typically executed after a
- // merge request has been merged. On success, it deploys the generated artifacts to the
- // Maven repository server.
- stage("SNAPSHOT build") {
- when { branch pattern: "main|main-v2", comparator: "REGEXP" }
-
- steps {
- withMaven(maven: MAVEN_VERSION, jdk: JDK_VERSION) {
- script {
- def mavenCommand = 'mvn ' +
- params.extraMavenArguments +
- ' -U -Dmaven.test.failure.ignore=true clean deploy'
-
- if (isUnix()) {
- sh script: mavenCommand
- }
- else {
- bat script: mavenCommand
- }
- }
- }
-
- script {
- def mavenConsoleIssues = scanForIssues tool: mavenConsole()
- def javaIssues = scanForIssues tool: java()
- def javaDocIssues = scanForIssues tool: javaDoc()
- publishIssues issues: [mavenConsoleIssues, javaIssues, javaDocIssues]
- }
- }
- }
- }
+defaultPipeline {
+ // The Eclipse libraries that our plugins depend unfortunately on required Java 11
+ jdk = 'jdk_11_latest'
+ extraMavenArguments = '-Pjacoco,spotbugs,pmd'
}
| 0
|
f85145040d522f51b04396378173607cb6d944e8
|
https://github.com/jenkinsci/google-play-android-publisher-plugin/commit/f85145040d522f51b04396378173607cb6d944e8
|
Merge pull request #39 from ntherning/add-release-name-parameter
Support setting the name of the release in the Play Console UI
|
diff --git a/README.md b/README.md
index e18be53..ee42ddd 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,7 @@ The `androidApkUpload` build step lets you upload Android App Bundle (AAB) or AP
| googlePlayCredentialsId | string | `'Google Play creds'` | (none) | Name of the Google Service Account credential created in Jenkins |
| filesPattern | string | `'release/my-app.aab'` | `'**/build/outputs/**/*.aab, **/build/outputs/**/*.apk'` | Comma-separated glob patterns or filenames pointing to the app files to upload, relative to the root of the workspace |
| trackName | string | `'internal'` | (none) | Google Play track to which the app files should be published |
+| releaseName | string | `'1.2.3' ` | (none) | Name used to identify this release in the Play Console UI. Generated from the version_name in the APKs if not set. |
| rolloutPercentage | string | `'1.5'` | (none) | The rollout percentage to set on the track; use 0% to create a draft release |
| ~rolloutPercent~<br>(deprecated) | number | `1.5` | (none) | (deprecated, but still supported; prefer `rolloutPercentage` instead — it takes priority if both are defined) |
| deobfuscationFiles<br>Pattern | string | `'**/mapping.txt'` | (none) | Comma-separated glob patterns or filenames pointing to ProGuard mapping files to associate with the uploaded app files |
@@ -227,6 +228,7 @@ The `androidApkMove` build step lets you move existing Android app versions (whe
|-------------------------|---------|------------------------|----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------|
| googlePlayCredentialsId | string | `'Google Play creds'` | (none) | Name of the Google Service Account credential created in Jenkins |
| trackName | string | `'internal'` | (none) | Google Play release track to update with the given app versions |
+| releaseName | string | `'1.2.3' ` | (none) | Name used to identify this release in the Play Console UI. Generated from the version_name in the APKs if not set. |
| rolloutPercentage | string | `'1.5'` | (none) | The rollout percentage to set on the given release track; use 0% to create a draft release |
| ~rolloutPercent~<br>(deprecated) | number | `1.5` | (none) | (deprecated, but still supported; prefer `rolloutPercentage` instead — it takes priority if both are defined) |
| fromVersionCode | boolean | `true` | `false` | If true, the `applicationId` and `versionCodes` parameters will be used. Otherwise the `filesPattern` parameter will be used |
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java
index 084d75a..efe26b2 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java
@@ -58,6 +58,7 @@
private String expansionFilesPattern;
private boolean usePreviousExpansionFilesIfMissing;
private String trackName;
+ private String releaseName;
private String rolloutPercentage;
private RecentChanges[] recentChangeList;
private String inAppUpdatePriority;
@@ -171,6 +172,16 @@ public String getTrackName() {
return fixEmptyAndTrim(trackName);
}
+ @DataBoundSetter
+ public void setReleaseName(String releaseName) {
+ this.releaseName = releaseName;
+ }
+
+ @Nullable
+ public String getReleaseName() {
+ return fixEmptyAndTrim(releaseName);
+ }
+
@DataBoundSetter
public void setDeobfuscationFilesPattern(String deobfuscationFilesPattern) {
this.deobfuscationFilesPattern = deobfuscationFilesPattern;
@@ -231,6 +242,10 @@ private String getCanonicalTrackName() throws IOException, InterruptedException
return expand(getTrackName());
}
+ private String getExpandedReleaseName() throws IOException, InterruptedException {
+ return expand(getReleaseName());
+ }
+
private String getExpandedDeobfuscationFilesPattern() throws IOException, InterruptedException {
return expand(getDeobfuscationFilesPattern());
}
@@ -527,7 +542,7 @@ private boolean publishApk(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace,
try {
GoogleRobotCredentials credentials = getCredentialsHandler().getServiceAccountCredentials(run.getParent());
return workspace.act(new ApkUploadTask(listener, credentials, applicationId, workspace, validFiles,
- expansionFiles, usePreviousExpansionFilesIfMissing, getCanonicalTrackName(),
+ expansionFiles, usePreviousExpansionFilesIfMissing, getCanonicalTrackName(), getExpandedReleaseName(),
getExpandedRolloutPercentage(), getExpandedRecentChangesList(), getExpandedInAppUpdatePriority()));
} catch (UploadException e) {
logger.println(String.format("Upload failed: %s", getPublisherErrorMessage(e)));
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkUploadTask.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkUploadTask.java
index a293fd2..984be04 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkUploadTask.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkUploadTask.java
@@ -50,9 +50,9 @@
// TODO: Could be renamed
ApkUploadTask(TaskListener listener, GoogleRobotCredentials credentials, String applicationId,
FilePath workspace, List<UploadFile> appFilesToUpload, Map<Long, ExpansionFileSet> expansionFiles,
- boolean usePreviousExpansionFilesIfMissing, String trackName, double rolloutPercentage,
+ boolean usePreviousExpansionFilesIfMissing, String trackName, String releaseName, double rolloutPercentage,
ApkPublisher.RecentChanges[] recentChangeList, Integer inAppUpdatePriority) {
- super(listener, credentials, applicationId, trackName, rolloutPercentage, inAppUpdatePriority);
+ super(listener, credentials, applicationId, trackName, releaseName, rolloutPercentage, inAppUpdatePriority);
this.workspace = workspace;
this.appFilesToUpload = appFilesToUpload;
this.expansionFiles = expansionFiles;
@@ -182,7 +182,7 @@ protected Boolean execute() throws IOException, InterruptedException {
// Assign all uploaded app files to the configured track
List<LocalizedText> releaseNotes = Util.transformReleaseNotes(recentChangeList);
TrackRelease release =
- Util.buildRelease(uploadedVersionCodes, rolloutFraction, inAppUpdatePriority, releaseNotes);
+ Util.buildRelease(uploadedVersionCodes, releaseName, rolloutFraction, inAppUpdatePriority, releaseNotes);
assignAppFilesToTrack(trackName, rolloutFraction, release);
// Commit all the changes
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java
index 6b0d201..8580317 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java
@@ -38,6 +38,7 @@
private String versionCodes;
private String filesPattern;
private String trackName;
+ private String releaseName;
private String rolloutPercentage;
private String inAppUpdatePriority;
@@ -180,6 +181,16 @@ public String getTrackName() {
return fixEmptyAndTrim(trackName);
}
+ @DataBoundSetter
+ public void setReleaseName(String releaseName) {
+ this.releaseName = releaseName;
+ }
+
+ @Nullable
+ public String getReleaseName() {
+ return releaseName;
+ }
+
@DataBoundSetter
public void setInAppUpdatePriority(@Nullable String priorityStr) {
this.inAppUpdatePriority = priorityStr;
@@ -206,6 +217,10 @@ private String getCanonicalTrackName() throws IOException, InterruptedException
return expand(getTrackName());
}
+ private String getExpandedReleaseName() throws IOException, InterruptedException {
+ return expand(getReleaseName());
+ }
+
@Nullable
private String getExpandedRolloutPercentageString() throws IOException, InterruptedException {
return expand(getRolloutPercentage());
@@ -331,7 +346,8 @@ private boolean assignAppFiles(@Nonnull Run<?, ?> run, @Nonnull FilePath workspa
try {
GoogleRobotCredentials credentials = getCredentialsHandler().getServiceAccountCredentials(run.getParent());
return workspace.act(new TrackAssignmentTask(listener, credentials, applicationId, versionCodeList,
- getCanonicalTrackName(), getExpandedRolloutPercentage(), getExpandedInAppUpdatePriority()));
+ getCanonicalTrackName(), getExpandedReleaseName(), getExpandedRolloutPercentage(),
+ getExpandedInAppUpdatePriority()));
} catch (UploadException e) {
logger.println(String.format("Assignment failed: %s", getPublisherErrorMessage(e)));
logger.println("No changes have been applied to the Google Play account");
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackAssignmentTask.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackAssignmentTask.java
index 9ce11d4..b94ae65 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackAssignmentTask.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackAssignmentTask.java
@@ -25,9 +25,9 @@
private final List<Long> versionCodes;
TrackAssignmentTask(TaskListener listener, GoogleRobotCredentials credentials, String applicationId,
- Collection<Long> versionCodes, String trackName, double rolloutPercentage,
+ Collection<Long> versionCodes, String trackName, String releaseName, double rolloutPercentage,
Integer inAppUpdatePriority) {
- super(listener, credentials, applicationId, trackName, rolloutPercentage, inAppUpdatePriority);
+ super(listener, credentials, applicationId, trackName, releaseName, rolloutPercentage, inAppUpdatePriority);
this.versionCodes = new ArrayList<>(versionCodes);
}
@@ -101,7 +101,7 @@ protected Boolean execute() throws IOException {
.orElse(null);
// Assign the version codes to the configured track
- TrackRelease release = Util.buildRelease(versionCodes, rolloutFraction, inAppUpdatePriority, releaseNotes);
+ TrackRelease release = Util.buildRelease(versionCodes, releaseName, rolloutFraction, inAppUpdatePriority, releaseNotes);
assignAppFilesToTrack(trackName, rolloutFraction, release);
// Commit the changes
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackPublisherTask.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackPublisherTask.java
index 2a81a67..7096ea7 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackPublisherTask.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/TrackPublisherTask.java
@@ -13,14 +13,16 @@
protected final String applicationId;
protected String trackName;
+ protected final String releaseName;
protected final double rolloutFraction;
protected final Integer inAppUpdatePriority;
TrackPublisherTask(TaskListener listener, GoogleRobotCredentials credentials, String applicationId,
- String trackName, double rolloutPercentage, Integer inAppUpdatePriority) {
+ String trackName, String releaseName, double rolloutPercentage, Integer inAppUpdatePriority) {
super(listener, credentials);
this.applicationId = applicationId;
this.trackName = trackName;
+ this.releaseName = releaseName;
this.rolloutFraction = rolloutPercentage / 100d;
this.inAppUpdatePriority = inAppUpdatePriority;
}
@@ -55,6 +57,12 @@ void assignAppFilesToTrack(String trackName, double rolloutFraction, TrackReleas
}
logger.println(String.format(msgFormat, trackName,
join(updatedTrack.getReleases().get(0).getVersionCodes(), ", ")));
+
+ if (releaseName != null && !releaseName.isEmpty()) {
+ logger.println(String.format("Using name '%s' for this release", releaseName));
+ } else {
+ logger.println("Using default name for this release");
+ }
}
}
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/Util.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/Util.java
index 09be791..717c563 100644
--- a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/Util.java
+++ b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/Util.java
@@ -123,7 +123,7 @@ static AndroidPublisher getPublisherClient(GoogleRobotCredentials credentials, S
}
static TrackRelease buildRelease(
- List<Long> versionCodes, double userFraction, Integer inAppUpdatePriority, @Nullable List<LocalizedText> releaseNotes
+ List<Long> versionCodes, String releaseName, double userFraction, Integer inAppUpdatePriority, @Nullable List<LocalizedText> releaseNotes
) {
final String status;
final Double fraction;
@@ -144,6 +144,7 @@ static TrackRelease buildRelease(
TrackRelease release = new TrackRelease()
.setVersionCodes(versionCodes)
+ .setName(releaseName)
.setUserFraction(fraction)
.setInAppUpdatePriority(inAppUpdatePriority)
.setStatus(status);
diff --git a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly
index 0c2dcfa..8177cc4 100644
--- a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly
@@ -25,6 +25,10 @@
<f:combobox style="width:15em" />
</f:entry>
+ <f:entry title="${%Release name}" field="releaseName">
+ <f:textbox style="width:15em" />
+ </f:entry>
+
<f:entry title="${%Rollout %}" field="rolloutPercentage">
<f:textbox style="width:15em" />
</f:entry>
diff --git a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/help-releaseName.html b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/help-releaseName.html
new file mode 100644
index 0000000..a618d97
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/help-releaseName.html
@@ -0,0 +1,7 @@
+<div>
+ The release name, used to identify this release in the Play Console UI. Not required to be
+ unique. This is optional, if not set it will be generated from the version_name in the APKs.
+ <hr/>
+ This field supports substituting environment variables in the form
+ <tt>${SOME_VARIABLE}</tt> or <tt>$SOME_VARIABLE</tt> at build time.
+</div>
diff --git a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly
index 9d7fd2f..1497f3c 100644
--- a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly
@@ -33,6 +33,10 @@
<f:combobox style="width:15em" />
</f:entry>
+ <f:entry title="${%Release name}" field="releaseName">
+ <f:textbox style="width:15em" />
+ </f:entry>
+
<f:entry title="${%Rollout %}" field="rolloutPercentage">
<f:textbox style="width:15em" />
</f:entry>
diff --git a/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/help-releaseName.html b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/help-releaseName.html
new file mode 100644
index 0000000..a618d97
--- /dev/null
+++ b/src/main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/help-releaseName.html
@@ -0,0 +1,7 @@
+<div>
+ The release name, used to identify this release in the Play Console UI. Not required to be
+ unique. This is optional, if not set it will be generated from the version_name in the APKs.
+ <hr/>
+ This field supports substituting environment variables in the form
+ <tt>${SOME_VARIABLE}</tt> or <tt>$SOME_VARIABLE</tt> at build time.
+</div>
diff --git a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisherTest.java b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisherTest.java
index d9c3fa2..62b8d85 100644
--- a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisherTest.java
+++ b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisherTest.java
@@ -114,6 +114,7 @@ public void configRoundtripWorks() throws Exception {
publisher.setExpansionFilesPattern("${EXP_FILES}");
publisher.setUsePreviousExpansionFilesIfMissing(true);
publisher.setTrackName("alpha");
+ publisher.setReleaseName("1.2.3");
publisher.setRolloutPercentage("12.3456789");
publisher.setRecentChangeList(new ApkPublisher.RecentChanges[] {
new ApkPublisher.RecentChanges("en", "Hello!"),
@@ -349,6 +350,7 @@ public void uploadingApkWithMinimalConfigurationUsesDefaults() throws Exception
assertResultWithLogLines(j, p, Result.SUCCESS,
"Setting rollout to target 100% of 'production' track users",
"The 'production' release track will now contain the version code(s): 42",
+ "Using default name for this release",
"Changes were successfully applied to Google Play"
);
}
@@ -367,6 +369,7 @@ public void uploadSingleApk_inFolder_succeeds() throws Exception {
publisher.setGoogleCredentialsId("folder-credentials");
publisher.setFilesPattern("**/*.apk");
publisher.setTrackName("production");
+ publisher.setReleaseName("1.2.3");
publisher.setRolloutPercentage("100");
p.getPublishersList().add(publisher);
setUpApkFile(p);
@@ -378,6 +381,7 @@ public void uploadSingleApk_inFolder_succeeds() throws Exception {
"versionCode: 42",
"Setting rollout to target 100% of 'production' track users",
"The 'production' release track will now contain the version code(s): 42",
+ "Using name '1.2.3' for this release",
"Changes were successfully applied to Google Play"
);
}
@@ -394,6 +398,7 @@ public void uploadingApkWithParametersSucceeds() throws Exception {
),
new StringParameterDefinition("APK_PATTERN", "**/app.apk"),
new StringParameterDefinition("TRACK_NAME", "production"),
+ new StringParameterDefinition("RELEASE_NAME", "1.2.3"),
new StringParameterDefinition("ROLLOUT_PCT", "12.5%")
);
p.addProperty(pdp);
@@ -403,6 +408,7 @@ public void uploadingApkWithParametersSucceeds() throws Exception {
publisher.setGoogleCredentialsId("${GP_CREDENTIAL}");
publisher.setFilesPattern("${APK_PATTERN}");
publisher.setTrackName("${TRACK_NAME}");
+ publisher.setReleaseName("${RELEASE_NAME}");
publisher.setRolloutPercentage("${ROLLOUT_PCT}");
p.getPublishersList().add(publisher);
@@ -415,6 +421,7 @@ public void uploadingApkWithParametersSucceeds() throws Exception {
assertResultWithLogLines(j, p, Result.SUCCESS,
"- Credential: test-credentials",
"Setting rollout to target 12.5% of 'production' track users",
+ "Using name '1.2.3' for this release",
"Changes were successfully applied to Google Play"
);
@@ -423,6 +430,7 @@ public void uploadingApkWithParametersSucceeds() throws Exception {
transport, "/org.jenkins.appId/edits/the-edit-id/tracks/production", Track.class
);
TrackRelease release = track.getReleases().get(0);
+ assertEquals("1.2.3", release.getName());
assertEquals("inProgress", release.getStatus());
assertEquals(0.125, release.getUserFraction(), 0.0001);
}
@@ -583,10 +591,27 @@ public void uploadingApkWithPipelineSucceeds() throws Exception {
uploadApkWithPipelineAndAssertSuccess(
stepDefinition,
"Setting rollout to target 100% of 'production' track users",
+ "Using default name for this release",
"The 'production' release track will now contain the version code(s): 42"
);
}
+ @Test
+ public void uploadingApkWithPipelineWithReleaseNameSucceeds() throws Exception {
+ // Given a Pipeline with only the required parameters
+ String stepDefinition = "androidApkUpload googleCredentialsId: 'test-credentials',\n" +
+ " trackName: 'production',\n" +
+ " releaseName: '1.2.3',\n" +
+ " rolloutPercentage: '100'";
+
+ uploadApkWithPipelineAndAssertSuccess(
+ stepDefinition,
+ "Setting rollout to target 100% of 'production' track users",
+ "Using name '1.2.3' for this release",
+ "The 'production' release track will now contain the version code(s): 42"
+ );
+ }
+
@Test
public void uploadingApkWithPipelineWithRolloutPercentSucceeds() throws Exception {
// Given a step with a deprecated `rolloutPercent` value
@@ -949,6 +974,7 @@ public void uploadSingleApk_fromSlave_succeeds() throws Exception {
"versionCode: 42",
"Setting rollout to target 100% of 'production' track users",
"The 'production' release track will now contain the version code(s): 42",
+ "Using default name for this release",
"Changes were successfully applied to Google Play"
);
}
diff --git a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilderTest.java b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilderTest.java
index 8084c12..d04dac6 100644
--- a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilderTest.java
+++ b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilderTest.java
@@ -95,6 +95,7 @@ public void configRoundtripWorks() throws Exception {
builder.setVersionCodes("42");
builder.setFilesPattern("**/*.apk");
builder.setTrackName("production");
+ builder.setReleaseName("1.2.3");
builder.setRolloutPercentage("5");
project.getBuildersList().add(builder);
diff --git a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/UtilsTest.java b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/UtilsTest.java
index 2db5a3f..0aa05ed 100644
--- a/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/UtilsTest.java
+++ b/src/test/java/org/jenkinsci/plugins/googleplayandroidpublisher/UtilsTest.java
@@ -33,7 +33,7 @@ public void setUp() {
public void buildRelease_basicInputs() {
List<Long> versionCodes = Arrays.asList(1L, 2L, 3L);
double fraction = 0.05;
- TrackRelease track = Util.buildRelease(versionCodes, fraction, null, null);
+ TrackRelease track = Util.buildRelease(versionCodes, null, fraction, null, null);
assertThat(track.getVersionCodes(), contains(1L, 2L, 3L));
assertEquals(0.05, track.getUserFraction(), 0.001);
@@ -45,7 +45,7 @@ public void buildRelease_basicInputs() {
public void buildRelease_withZeroFraction_releaseIsComplete() {
List<Long> versionCodes = Arrays.asList(1L, 2L, 3L);
double fraction = 0.0;
- TrackRelease track = Util.buildRelease(versionCodes, fraction, null, null);
+ TrackRelease track = Util.buildRelease(versionCodes, null, fraction, null, null);
assertNull(track.getUserFraction());
assertEquals("draft", track.getStatus());
@@ -55,7 +55,7 @@ public void buildRelease_withZeroFraction_releaseIsComplete() {
public void buildRelease_withNonZeroFraction_releaseIsInProgress() {
List<Long> versionCodes = Arrays.asList(1L, 2L, 3L);
double fraction = 0.123;
- TrackRelease track = Util.buildRelease(versionCodes, fraction, null, null);
+ TrackRelease track = Util.buildRelease(versionCodes, null, fraction, null, null);
assertEquals(0.123, track.getUserFraction(), 0.0001);
assertEquals("inProgress", track.getStatus());
@@ -66,13 +66,22 @@ public void buildRelease_withInAppUpdatePriority_trackRelease_contains_inAppUpda
List<Long> versionCodes = Arrays.asList(1L, 2L, 3L);
double fraction = 0.123;
Integer priority = 1;
- TrackRelease track = Util.buildRelease(versionCodes, fraction, priority, null);
+ TrackRelease track = Util.buildRelease(versionCodes, null, fraction, priority, null);
assertEquals(0.123, track.getUserFraction(), 0.0001);
assertEquals("inProgress", track.getStatus());
assertEquals(priority, track.getInAppUpdatePriority());
}
+ @Test
+ public void buildRelease_releaseName() {
+ List<Long> versionCodes = Arrays.asList(1L, 2L, 3L);
+ double fraction = 1.0;
+ TrackRelease track = Util.buildRelease(versionCodes, "1.2.3", fraction, null, null);
+
+ assertEquals("1.2.3", track.getName());
+ }
+
@Test
public void releaseNotes_nullToNull() {
// null -> null
| 0
|
726812fa2fa7ce16bcf58f6e115f65427a1c0950
|
https://github.com/ImageMagick/ImageMagick/commit/726812fa2fa7ce16bcf58f6e115f65427a1c0950
|
Prevent buffer overflow in magick/draw.c
|
diff --git a/ChangeLog b/ChangeLog
index 1e88dc94cc..d2dfe6830a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-05-04 7.0.1-2 Cristy <quetzlzacatenango@image...>
+ * Check for buffer overflow in magick/draw.c/DrawStrokePolygon().
+
2016-05-03 7.0.1-1 Cristy <quetzlzacatenango@image...>
* New version 7.0.1-1, GIT revision 10723:9fc8a0c:20160503.
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 547678410b..d9fe9e7f2d 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1417,7 +1417,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
return(MagickFalse);
(void) QueryColorCompliance("#0000",AllCompliance,
&clip_mask->background_color,exception);
- clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
+ clip_mask->background_color.alpha=(MagickRealType) TransparentAlpha;
(void) SetImageBackgroundColor(clip_mask,exception);
if (image->debug != MagickFalse)
(void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin clip-path %s",
@@ -1541,7 +1541,7 @@ static MagickBooleanType DrawDashPolygon(const DrawInfo *draw_info,
status=MagickTrue;
maximum_length=0.0;
total_length=0.0;
- for (i=1; (i < number_vertices) && (length >= 0.0); i++)
+ for (i=1; (i < (ssize_t) number_vertices) && (length >= 0.0); i++)
{
dx=primitive_info[i].point.x-primitive_info[i-1].point.x;
dy=primitive_info[i].point.y-primitive_info[i-1].point.y;
@@ -1794,7 +1794,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
/*
Interpret graphic primitive.
*/
- GetNextToken(q,&q,extent,keyword);
+ GetNextToken(q,&q,MagickPathExtent,keyword);
if (*keyword == '\0')
break;
if (*keyword == '#')
@@ -2104,7 +2104,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
GetNextToken(q,&q,extent,token);
weight=ParseCommandOption(MagickWeightOptions,MagickFalse,token);
if (weight == -1)
- weight=StringToUnsignedLong(token);
+ weight=(ssize_t) StringToUnsignedLong(token);
graphic_context[n]->weight=(size_t) weight;
break;
}
@@ -2353,7 +2353,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
(void) SetImageArtifact(image,key,token);
(void) FormatLocaleString(key,MagickPathExtent,"%s-type",name);
(void) SetImageArtifact(image,key,type);
- (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",
+ name);
(void) FormatLocaleString(geometry,MagickPathExtent,
"%gx%g%+.15g%+.15g",
MagickMax(fabs(bounds.x2-bounds.x1+1.0),1.0),
@@ -4608,7 +4609,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
*/
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
@@ -4643,7 +4644,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
}
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
@@ -4743,7 +4744,7 @@ static MagickBooleanType DrawStrokePolygon(Image *image,
if (clone_info->stroke_pattern != (Image *) NULL)
clone_info->fill_pattern=CloneImage(clone_info->stroke_pattern,0,0,
MagickTrue,exception);
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
clone_info->stroke_width=0.0;
clone_info->fill_rule=NonZeroRule;
status=MagickTrue;
@@ -4858,7 +4859,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
draw_info->miterlimit=10;
draw_info->decorate=NoDecoration;
draw_info->pointsize=12.0;
- draw_info->undercolor.alpha=(Quantum) TransparentAlpha;
+ draw_info->undercolor.alpha=(MagickRealType) TransparentAlpha;
draw_info->compose=OverCompositeOp;
draw_info->render=MagickTrue;
draw_info->debug=IsEventLogging();
@@ -4925,7 +4926,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
weight=ParseCommandOption(MagickWeightOptions,MagickFalse,option);
if (weight == -1)
- weight=StringToUnsignedLong(option);
+ weight=(ssize_t) StringToUnsignedLong(option);
draw_info->weight=(size_t) weight;
}
exception=DestroyExceptionInfo(exception);
@@ -6021,17 +6022,29 @@ static PrimitiveInfo *TraceStrokePolygon(const DrawInfo *draw_info,
}
if (q >= (ssize_t) (max_strokes-6*BezierQuantum-360))
{
- max_strokes+=6*BezierQuantum+360;
- path_p=(PointInfo *) ResizeQuantumMemory(path_p,(size_t) max_strokes,
- sizeof(*path_p));
- path_q=(PointInfo *) ResizeQuantumMemory(path_q,(size_t) max_strokes,
- sizeof(*path_q));
- if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL))
- {
- polygon_primitive=(PrimitiveInfo *)
- RelinquishMagickMemory(polygon_primitive);
- return((PrimitiveInfo *) NULL);
- }
+ if (~max_strokes < (6*BezierQuantum+360))
+ {
+ path_p=(PointInfo *) RelinquishMagickMemory(path_p);
+ path_q=(PointInfo *) RelinquishMagickMemory(path_q);
+ }
+ else
+ {
+ max_strokes+=6*BezierQuantum+360;
+ path_p=(PointInfo *) ResizeQuantumMemory(path_p,max_strokes,
+ sizeof(*path_p));
+ path_q=(PointInfo *) ResizeQuantumMemory(path_q,max_strokes,
+ sizeof(*path_q));
+ }
+ if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL))
+ {
+ if (path_p != (PointInfo *) NULL)
+ path_p=(PointInfo *) RelinquishMagickMemory(path_p);
+ if (path_q != (PointInfo *) NULL)
+ path_q=(PointInfo *) RelinquishMagickMemory(path_q);
+ polygon_primitive=(PrimitiveInfo *)
+ RelinquishMagickMemory(polygon_primitive);
+ return((PrimitiveInfo *) NULL);
+ }
}
dot_product=dx.q*dy.p-dx.p*dy.q;
if (dot_product <= 0.0)
| 1
|
3c937f75ba5853ada175542d5c4849fb95eb64cd
|
https://github.com/mailcow/mailcow-dockerized/pull/268/commits/3c937f75ba5853ada175542d5c4849fb95eb64cd
|
Add OWASP CSRF Protector, add more secure session handling
|
diff --git a/data/web/inc/lib/composer.json b/data/web/inc/lib/composer.json
index d811958b53..7adb5ca098 100644
--- a/data/web/inc/lib/composer.json
+++ b/data/web/inc/lib/composer.json
@@ -1,6 +1,7 @@
{
"require": {
"robthree/twofactorauth": "^1.6",
- "yubico/u2flib-server": "^1.0"
+ "yubico/u2flib-server": "^1.0",
+ "owasp/csrf-protector-php": "dev-master"
}
}
diff --git a/data/web/inc/lib/composer.lock b/data/web/inc/lib/composer.lock
index 692521d2cb..d0f94fc4a8 100644
--- a/data/web/inc/lib/composer.lock
+++ b/data/web/inc/lib/composer.lock
@@ -4,8 +4,44 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "5652a086b6d277d72d7ae0341e517b1e",
+ "content-hash": "413fc63dc6c7815f0a175217bccb490a",
"packages": [
+ {
+ "name": "owasp/csrf-protector-php",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/mebjas/CSRF-Protector-PHP.git",
+ "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/mebjas/CSRF-Protector-PHP/zipball/aec0d6966992363a7192b2ae9fb0a9643e8fa26b",
+ "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b",
+ "shasum": ""
+ },
+ "require-dev": {
+ "satooshi/php-coveralls": "~1.0"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "libs/csrf/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "APACHE"
+ ],
+ "description": "CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app.",
+ "homepage": "https://github.com/mebjas/CSRF-Protector-PHP",
+ "keywords": [
+ "csrf",
+ "owasp",
+ "security"
+ ],
+ "time": "2017-04-12 05:47:07"
+ },
{
"name": "robthree/twofactorauth",
"version": "1.6",
@@ -92,7 +128,9 @@
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {
+ "owasp/csrf-protector-php": 20
+ },
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
diff --git a/data/web/inc/lib/vendor/composer/autoload_classmap.php b/data/web/inc/lib/vendor/composer/autoload_classmap.php
index 44393069fe..b62afd4e21 100644
--- a/data/web/inc/lib/vendor/composer/autoload_classmap.php
+++ b/data/web/inc/lib/vendor/composer/autoload_classmap.php
@@ -6,6 +6,14 @@
$baseDir = dirname($vendorDir);
return array(
+ 'alreadyInitializedException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'baseJSFileNotFoundExceptio' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'configFileNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'csrfProtector' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'incompleteConfigurationException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'jsFileNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'logDirectoryNotFoundException' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'logFileWriteError' => $vendorDir . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
'u2flib_server\\Error' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
'u2flib_server\\RegisterRequest' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
'u2flib_server\\Registration' => $vendorDir . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
diff --git a/data/web/inc/lib/vendor/composer/autoload_static.php b/data/web/inc/lib/vendor/composer/autoload_static.php
index 5e2dabab16..d6d6268543 100644
--- a/data/web/inc/lib/vendor/composer/autoload_static.php
+++ b/data/web/inc/lib/vendor/composer/autoload_static.php
@@ -21,6 +21,14 @@ class ComposerStaticInit873464e4bd965a3168f133248b1b218b
);
public static $classMap = array (
+ 'alreadyInitializedException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'baseJSFileNotFoundExceptio' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'configFileNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'csrfProtector' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'incompleteConfigurationException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'jsFileNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'logDirectoryNotFoundException' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
+ 'logFileWriteError' => __DIR__ . '/..' . '/owasp/csrf-protector-php/libs/csrf/csrfprotector.php',
'u2flib_server\\Error' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
'u2flib_server\\RegisterRequest' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
'u2flib_server\\Registration' => __DIR__ . '/..' . '/yubico/u2flib-server/src/u2flib_server/U2F.php',
diff --git a/data/web/inc/lib/vendor/composer/installed.json b/data/web/inc/lib/vendor/composer/installed.json
index bbe76d824f..fa07bcd470 100644
--- a/data/web/inc/lib/vendor/composer/installed.json
+++ b/data/web/inc/lib/vendor/composer/installed.json
@@ -84,5 +84,43 @@
],
"description": "Library for U2F implementation",
"homepage": "https://developers.yubico.com/php-u2flib-server"
+ },
+ {
+ "name": "owasp/csrf-protector-php",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/mebjas/CSRF-Protector-PHP.git",
+ "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/mebjas/CSRF-Protector-PHP/zipball/aec0d6966992363a7192b2ae9fb0a9643e8fa26b",
+ "reference": "aec0d6966992363a7192b2ae9fb0a9643e8fa26b",
+ "shasum": ""
+ },
+ "require-dev": {
+ "satooshi/php-coveralls": "~1.0"
+ },
+ "time": "2017-04-12T05:47:07+00:00",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "libs/csrf/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "APACHE"
+ ],
+ "description": "CSRF protector php, a standalone php library for csrf mitigation in web applications. Easy to integrate in any php web app.",
+ "homepage": "https://github.com/mebjas/CSRF-Protector-PHP",
+ "keywords": [
+ "csrf",
+ "owasp",
+ "security"
+ ]
}
]
diff --git a/data/web/inc/lib/vendor/owasp/csrf-protector-php b/data/web/inc/lib/vendor/owasp/csrf-protector-php
new file mode 160000
index 0000000000..aec0d69669
--- /dev/null
+++ b/data/web/inc/lib/vendor/owasp/csrf-protector-php
@@ -0,0 +1 @@
+Subproject commit aec0d6966992363a7192b2ae9fb0a9643e8fa26b
diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index 76ed81eef2..902b46aff0 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -1,20 +1,5 @@
<?php
-//ini_set("session.cookie_secure", 1);
-//ini_set("session.cookie_httponly", 1);
-session_start();
-if (isset($_POST["logout"])) {
- if (isset($_SESSION["dual-login"])) {
- $_SESSION["mailcow_cc_username"] = $_SESSION["dual-login"]["username"];
- $_SESSION["mailcow_cc_role"] = $_SESSION["dual-login"]["role"];
- unset($_SESSION["dual-login"]);
- }
- else {
- session_unset();
- session_destroy();
- session_write_close();
- setcookie(session_name(),'',0,'/');
- }
-}
+require_once 'inc/sessions.inc.php';
require_once 'inc/vars.inc.php';
if (file_exists('./inc/vars.local.inc.php')) {
@@ -24,11 +9,25 @@
// Yubi OTP API
require_once 'inc/lib/Yubico.php';
-// U2F API + T/HOTP API
+// Autoload composer
require_once 'inc/lib/vendor/autoload.php';
-$u2f = new u2flib_server\U2F('https://' . $_SERVER['SERVER_NAME']);
+
+// U2F API + T/HOTP API
+$u2f = new u2flib_server\U2F('https://' . $_SERVER['HTTP_HOST']);
$tfa = new RobThree\Auth\TwoFactorAuth('mailcow UI');
+// OWASP CSRF Protector
+$csrfProtector = new csrfProtector;
+class mailcowCsrfProtector extends csrfprotector {
+ public static function logCSRFattack() {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'CSRF violation'
+ );
+ }
+}
+mailcowCsrfProtector::init();
+
// Redis
$redis = new Redis();
$redis->connect('redis-mailcow', 6379);
diff --git a/data/web/inc/sessions.inc.php b/data/web/inc/sessions.inc.php
new file mode 100644
index 0000000000..e6beb4853b
--- /dev/null
+++ b/data/web/inc/sessions.inc.php
@@ -0,0 +1,58 @@
+<?php
+// Start session
+ini_set("session.cookie_httponly", 1);
+if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
+ strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == "https") {
+ ini_set("session.cookie_secure", 1);
+ $IS_HTTPS = true;
+}
+elseif (isset($_SERVER['HTTPS'])) {
+ ini_set("session.cookie_secure", 1);
+ $IS_HTTPS = true;
+}
+else {
+ $IS_HTTPS = false;
+}
+session_set_cookie_params($GLOBALS['SESSION_LIFETIME'], '/', $_SERVER['SERVER_NAME'], $IS_HTTPS, true);
+session_start();
+
+// Handle logouts
+if (isset($_POST["logout"])) {
+ if (isset($_SESSION["dual-login"])) {
+ $_SESSION["mailcow_cc_username"] = $_SESSION["dual-login"]["username"];
+ $_SESSION["mailcow_cc_role"] = $_SESSION["dual-login"]["role"];
+ unset($_SESSION["dual-login"]);
+ }
+ else {
+ session_regenerate_id(true);
+ session_unset();
+ session_destroy();
+ session_write_close();
+ header("Location: /");
+ }
+}
+
+// Set session IP and UA
+if (!isset($_SESSION['SESS_REMOTE_IP'])) {
+ $_SESSION['SESS_REMOTE_IP'] = $_SERVER['REMOTE_ADDR'];
+}
+if (!isset($_SESSION['SESS_REMOTE_UA'])) {
+ $_SESSION['SESS_REMOTE_UA'] = $_SERVER['HTTP_USER_AGENT'];
+}
+
+// Check session
+function session_check() {
+ if (!isset($_SESSION['SESS_REMOTE_IP']) || !isset($_SESSION['SESS_REMOTE_UA'])) {
+ return false;
+ }
+ if ($_SESSION['SESS_REMOTE_IP'] != $_SERVER['REMOTE_ADDR']) {
+ return false;
+ }
+ if ($_SESSION['SESS_REMOTE_UA'] != $_SERVER['HTTP_USER_AGENT']) {
+ return false;
+ }
+ return true;
+}
+if (isset($_SESSION['mailcow_cc_role']) && session_check() === false) {
+ exit("Invalid session");
+}
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 6666d58c86..faef565d75 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -53,5 +53,7 @@
// Rows until pagination begins
$PAGINATION_SIZE = 10;
+// Session lifetime in seconds
+$SESSION_LIFETIME = 3600;
?>
| 1
|
909dd0d3bbf37f46d2675232d100181c59609ab5
|
https://github.com/MiniProfiler/rack-mini-profiler/commit/909dd0d3bbf37f46d2675232d100181c59609ab5
|
FIX: Fetch Mini Profiler results only once in Turbolinks apps (#474)
* FIX: Fetch Mini Profiler only once in Turbolinks apps
|
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56b4f305..cea23cbe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,7 @@ jobs:
${{ runner.os }}-${{ matrix.ruby }}-gems-
- name: Setup gems
run: |
+ gem install bundler
bundle config path vendor/bundle
bundle install --jobs 4
- name: Tests
diff --git a/lib/html/includes.css b/lib/html/includes.css
index debc851d..7b1afdcf 100644
--- a/lib/html/includes.css
+++ b/lib/html/includes.css
@@ -231,8 +231,7 @@
top: 0px; }
.profiler-results.profiler-top.profiler-left {
left: 0px; }
- .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-totals,
- .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
+ .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-left.profiler-no-controls .profiler-result:last-child .profiler-button,
.profiler-results.profiler-top.profiler-left .profiler-controls {
-webkit-border-bottom-right-radius: 10px;
-moz-border-radius-bottomright: 10px;
@@ -242,8 +241,7 @@
border-right: 1px solid #888; }
.profiler-results.profiler-top.profiler-right {
right: 0px; }
- .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-totals,
- .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
+ .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-top.profiler-right.profiler-no-controls .profiler-result:last-child .profiler-button,
.profiler-results.profiler-top.profiler-right .profiler-controls {
-webkit-border-bottom-left-radius: 10px;
-moz-border-radius-bottomleft: 10px;
@@ -255,8 +253,7 @@
bottom: 0px; }
.profiler-results.profiler-bottom.profiler-left {
left: 0px; }
- .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-totals,
- .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-result:first-child .profiler-button,
+ .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-left.profiler-no-controls .profiler-result:first-child .profiler-button,
.profiler-results.profiler-bottom.profiler-left .profiler-controls {
-webkit-border-top-right-radius: 10px;
-moz-border-radius-topright: 10px;
@@ -266,8 +263,7 @@
border-right: 1px solid #888; }
.profiler-results.profiler-bottom.profiler-right {
right: 0px; }
- .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-totals,
- .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-result:first-child .profiler-button,
+ .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-totals, .profiler-results.profiler-bottom.profiler-right.profiler-no-controls .profiler-result:first-child .profiler-button,
.profiler-results.profiler-bottom.profiler-right .profiler-controls {
-webkit-border-bottom-top-radius: 10px;
-moz-border-radius-topleft: 10px;
@@ -373,7 +369,6 @@
@media print {
.profiler-results {
display: none; } }
-
.profiler-queries-bg {
z-index: 2147483642;
display: none;
diff --git a/lib/html/includes.js b/lib/html/includes.js
index cf2a0b45..d0608d2e 100644
--- a/lib/html/includes.js
+++ b/lib/html/includes.js
@@ -1,12 +1,13 @@
"use strict";
-var MiniProfiler = (function() {
+var _MiniProfiler = (function() {
var _arguments = arguments;
var options,
container,
controls,
- fetchedIds = [],
- fetchingIds = [],
+ fetchedIds = (window.MiniProfiler && window.MiniProfiler.fetchedIds) || [],
+ fetchingIds =
+ (window.MiniProfiler && window.MiniProfiler.fetchingIds) || [],
// so we never pull down a profiler twice
ajaxStartTime,
totalsControl,
@@ -634,6 +635,10 @@ var MiniProfiler = (function() {
}
};
+ var turbolinksSkipResultsFetch = function turbolinksSkipResultsFetch(event) {
+ event.data.xhr.__miniProfilerSkipResultsFetch = true;
+ };
+
var bindDocumentEvents = function bindDocumentEvents() {
document.addEventListener("click", onClickEvents);
document.addEventListener("keyup", onClickEvents);
@@ -642,6 +647,10 @@ var MiniProfiler = (function() {
if (typeof Turbolinks !== "undefined" && Turbolinks.supported) {
document.addEventListener("page:change", unbindDocumentEvents);
document.addEventListener("turbolinks:load", unbindDocumentEvents);
+ document.addEventListener(
+ "turbolinks:request-start",
+ turbolinksSkipResultsFetch
+ );
}
};
@@ -651,6 +660,10 @@ var MiniProfiler = (function() {
document.removeEventListener("keyup", toggleShortcutEvent);
document.removeEventListener("page:change", unbindDocumentEvents);
document.removeEventListener("turbolinks:load", unbindDocumentEvents);
+ document.removeEventListener(
+ "turbolinks:request-start",
+ turbolinksSkipResultsFetch
+ );
};
var initFullView = function initFullView() {
@@ -680,10 +693,12 @@ var MiniProfiler = (function() {
temp.innerHTML = MiniProfiler.templates.snapshotsGroupsList(data);
} else if (data.group_name) {
var allCustomFieldsNames = [];
- data.list.forEach(function (snapshot) {
- Object.keys(snapshot.custom_fields).forEach(function (k) {
- if (allCustomFieldsNames.indexOf(k) === -1 &&
- options.hiddenCustomFields.indexOf(k.toLowerCase()) === -1) {
+ data.list.forEach(function(snapshot) {
+ Object.keys(snapshot.custom_fields).forEach(function(k) {
+ if (
+ allCustomFieldsNames.indexOf(k) === -1 &&
+ options.hiddenCustomFields.indexOf(k.toLowerCase()) === -1
+ ) {
allCustomFieldsNames.push(k);
}
});
@@ -694,7 +709,7 @@ var MiniProfiler = (function() {
allCustomFieldsNames: allCustomFieldsNames
});
}
- Array.from(temp.children).forEach(function (child) {
+ Array.from(temp.children).forEach(function(child) {
document.body.appendChild(child);
});
};
@@ -767,213 +782,220 @@ var MiniProfiler = (function() {
fetchResults(options.ids);
}
- var send = XMLHttpRequest.prototype.send;
-
- XMLHttpRequest.prototype.send = function(data) {
- ajaxStartTime = new Date();
- this.addEventListener("load", function() {
- // responseURL isn't available in IE11
- if (
- this.responseURL &&
- this.responseURL.indexOf(window.location.origin) !== 0
- ) {
- return;
- }
- // getAllResponseHeaders isn't available in Edge.
- var allHeaders = this.getAllResponseHeaders
- ? this.getAllResponseHeaders()
- : null;
- if (
- allHeaders &&
- allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
- ) {
- return;
- }
- // should be a string of comma-separated ids
- var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
-
- if (stringIds) {
- var ids = stringIds.split(",");
- fetchResults(ids);
- }
- });
- send.call(this, data);
- }; // fetch results after ASP Ajax calls
-
- if (
- typeof Sys != "undefined" &&
- typeof Sys.WebForms != "undefined" &&
- typeof Sys.WebForms.PageRequestManager != "undefined"
- ) {
- // Get the instance of PageRequestManager.
- var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
- PageRequestManager.add_endRequest(function(sender, args) {
- if (args) {
- var response = args.get_response();
+ if (!window.MiniProfiler || !window.MiniProfiler.patchesApplied) {
+ var send = XMLHttpRequest.prototype.send;
+ XMLHttpRequest.prototype.send = function(data) {
+ ajaxStartTime = new Date();
+ this.addEventListener("load", function() {
+ // responseURL isn't available in IE11
if (
- response.get_responseAvailable() &&
- response._xmlHttpRequest !== null
+ this.responseURL &&
+ this.responseURL.indexOf(window.location.origin) !== 0
) {
- var stringIds = args
- .get_response()
- .getResponseHeader("X-MiniProfiler-Ids");
-
- if (stringIds) {
- var ids = stringIds.split(",");
- fetchResults(ids);
- }
+ return;
}
- }
- });
- } // more Asp.Net callbacks
-
- if (typeof WebForm_ExecuteCallback == "function") {
- WebForm_ExecuteCallback = (function(callbackObject) {
- // Store original function
- var original = WebForm_ExecuteCallback;
- return function(callbackObject) {
- original(callbackObject);
- var stringIds = callbackObject.xmlRequest.getResponseHeader(
- "X-MiniProfiler-Ids"
- );
+ if (this.__miniProfilerSkipResultsFetch) {
+ return;
+ }
+ // getAllResponseHeaders isn't available in Edge.
+ var allHeaders = this.getAllResponseHeaders
+ ? this.getAllResponseHeaders()
+ : null;
+ if (
+ allHeaders &&
+ allHeaders.toLowerCase().indexOf("x-miniprofiler-ids") === -1
+ ) {
+ return;
+ }
+ // should be a string of comma-separated ids
+ var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
if (stringIds) {
var ids = stringIds.split(",");
fetchResults(ids);
}
- };
- })();
- } // also fetch results after ExtJS requests, in case it is being used
+ });
+ send.call(this, data);
+ }; // fetch results after ASP Ajax calls
- if (
- typeof Ext != "undefined" &&
- typeof Ext.Ajax != "undefined" &&
- typeof Ext.Ajax.on != "undefined"
- ) {
- // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
- Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
- //iframed file uploads don't have headers
- if (!xhr || !xhr.getResponseHeader) {
- return;
- }
+ if (
+ typeof Sys != "undefined" &&
+ typeof Sys.WebForms != "undefined" &&
+ typeof Sys.WebForms.PageRequestManager != "undefined"
+ ) {
+ // Get the instance of PageRequestManager.
+ var PageRequestManager = Sys.WebForms.PageRequestManager.getInstance();
+ PageRequestManager.add_endRequest(function(sender, args) {
+ if (args) {
+ var response = args.get_response();
+
+ if (
+ response.get_responseAvailable() &&
+ response._xmlHttpRequest !== null
+ ) {
+ var stringIds = args
+ .get_response()
+ .getResponseHeader("X-MiniProfiler-Ids");
+
+ if (stringIds) {
+ var ids = stringIds.split(",");
+ fetchResults(ids);
+ }
+ }
+ }
+ });
+ } // more Asp.Net callbacks
+
+ if (typeof WebForm_ExecuteCallback == "function") {
+ WebForm_ExecuteCallback = (function(callbackObject) {
+ // Store original function
+ var original = WebForm_ExecuteCallback;
+ return function(callbackObject) {
+ original(callbackObject);
+ var stringIds = callbackObject.xmlRequest.getResponseHeader(
+ "X-MiniProfiler-Ids"
+ );
- var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
+ if (stringIds) {
+ var ids = stringIds.split(",");
+ fetchResults(ids);
+ }
+ };
+ })();
+ } // also fetch results after ExtJS requests, in case it is being used
- if (stringIds) {
- var ids = stringIds.split(",");
- fetchResults(ids);
- }
- });
- }
+ if (
+ typeof Ext != "undefined" &&
+ typeof Ext.Ajax != "undefined" &&
+ typeof Ext.Ajax.on != "undefined"
+ ) {
+ // Ext.Ajax is a singleton, so we just have to attach to its 'requestcomplete' event
+ Ext.Ajax.on("requestcomplete", function(e, xhr, settings) {
+ //iframed file uploads don't have headers
+ if (!xhr || !xhr.getResponseHeader) {
+ return;
+ }
- if (typeof MooTools != "undefined" && typeof Request != "undefined") {
- Request.prototype.addEvents({
- onComplete: function onComplete() {
- var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
+ var stringIds = xhr.getResponseHeader("X-MiniProfiler-Ids");
if (stringIds) {
var ids = stringIds.split(",");
fetchResults(ids);
}
- }
- });
- } // add support for AngularJS, which use the basic XMLHttpRequest object.
-
- if (window.angular && typeof XMLHttpRequest != "undefined") {
- var _send = XMLHttpRequest.prototype.send;
-
- XMLHttpRequest.prototype.send = function sendReplacement(data) {
- if (this.onreadystatechange) {
- if (
- typeof this.miniprofiler == "undefined" ||
- typeof this.miniprofiler.prev_onreadystatechange == "undefined"
- ) {
- this.miniprofiler = {
- prev_onreadystatechange: this.onreadystatechange
- };
+ });
+ }
- this.onreadystatechange = function onReadyStateChangeReplacement() {
- if (this.readyState == 4) {
- var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
+ if (typeof MooTools != "undefined" && typeof Request != "undefined") {
+ Request.prototype.addEvents({
+ onComplete: function onComplete() {
+ var stringIds = this.xhr.getResponseHeader("X-MiniProfiler-Ids");
- if (stringIds) {
- var ids = stringIds.split(",");
- fetchResults(ids);
+ if (stringIds) {
+ var ids = stringIds.split(",");
+ fetchResults(ids);
+ }
+ }
+ });
+ } // add support for AngularJS, which use the basic XMLHttpRequest object.
+
+ if (window.angular && typeof XMLHttpRequest != "undefined") {
+ var _send = XMLHttpRequest.prototype.send;
+
+ XMLHttpRequest.prototype.send = function sendReplacement(data) {
+ if (this.onreadystatechange) {
+ if (
+ typeof this.miniprofiler == "undefined" ||
+ typeof this.miniprofiler.prev_onreadystatechange == "undefined"
+ ) {
+ this.miniprofiler = {
+ prev_onreadystatechange: this.onreadystatechange
+ };
+
+ this.onreadystatechange = function onReadyStateChangeReplacement() {
+ if (this.readyState == 4) {
+ var stringIds = this.getResponseHeader("X-MiniProfiler-Ids");
+
+ if (stringIds) {
+ var ids = stringIds.split(",");
+ fetchResults(ids);
+ }
}
- }
- if (this.miniprofiler.prev_onreadystatechange !== null)
- return this.miniprofiler.prev_onreadystatechange.apply(
- this,
- arguments
- );
- };
+ if (this.miniprofiler.prev_onreadystatechange !== null)
+ return this.miniprofiler.prev_onreadystatechange.apply(
+ this,
+ arguments
+ );
+ };
+ }
}
- }
-
- return _send.apply(this, arguments);
- };
- } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
- if (
- typeof window.fetch === "function" &&
- window.fetch.__patchedByMiniProfiler === undefined
- ) {
- var __originalFetch = window.fetch;
+ return _send.apply(this, arguments);
+ };
+ } // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
- window.fetch = function(input, init) {
- var originalFetchRun = __originalFetch(input, init);
+ if (typeof window.fetch === "function") {
+ var __originalFetch = window.fetch;
- originalFetchRun.then(function(response) {
- try {
- // look for x-mini-profile-ids
- var entries = response.headers.entries();
- var _iteratorNormalCompletion = true;
- var _didIteratorError = false;
- var _iteratorError = undefined;
+ window.fetch = function(input, init) {
+ var originalFetchRun = __originalFetch(input, init);
+ originalFetchRun.then(function(response) {
try {
- for (
- var _iterator = entries[Symbol.iterator](), _step;
- !(_iteratorNormalCompletion = (_step = _iterator.next()).done);
- _iteratorNormalCompletion = true
- ) {
- var pair = _step.value;
-
- if (pair[0] && pair[0].toLowerCase() == "x-miniprofiler-ids") {
- var ids = pair[1].split(",");
- fetchResults(ids);
- }
- }
- } catch (err) {
- _didIteratorError = true;
- _iteratorError = err;
- } finally {
+ // look for x-mini-profile-ids
+ var entries = response.headers.entries();
+ var _iteratorNormalCompletion = true;
+ var _didIteratorError = false;
+ var _iteratorError = undefined;
+
try {
- if (!_iteratorNormalCompletion && _iterator.return != null) {
- _iterator.return();
+ for (
+ var _iterator = entries[Symbol.iterator](), _step;
+ !(_iteratorNormalCompletion = (_step = _iterator.next())
+ .done);
+ _iteratorNormalCompletion = true
+ ) {
+ var pair = _step.value;
+
+ if (
+ pair[0] &&
+ pair[0].toLowerCase() == "x-miniprofiler-ids"
+ ) {
+ var ids = pair[1].split(",");
+ fetchResults(ids);
+ }
}
+ } catch (err) {
+ _didIteratorError = true;
+ _iteratorError = err;
} finally {
- if (_didIteratorError) {
- throw _iteratorError;
+ try {
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
+ _iterator.return();
+ }
+ } finally {
+ if (_didIteratorError) {
+ throw _iteratorError;
+ }
}
}
+ } catch (e) {
+ console.error(e);
}
- } catch (e) {
- console.error(e);
- }
- });
- return originalFetchRun;
- };
-
- window.fetch.__patchedByMiniProfiler = true;
- } // some elements want to be hidden on certain doc events
+ });
+ return originalFetchRun;
+ };
+ }
+ window.MiniProfiler.patchesApplied = true;
+ }
bindDocumentEvents();
};
return {
+ fetchedIds: fetchedIds,
+ fetchingIds: fetchingIds,
init: function init() {
var script = document.getElementById("mini-profiler");
if (!script || !script.getAttribute) return;
@@ -1007,7 +1029,10 @@ var MiniProfiler = (function() {
sessionStorage["rack-mini-profiler-start-hidden"] === "true";
var htmlContainer = script.getAttribute("data-html-container");
var cssUrl = script.getAttribute("data-css-url");
- var hiddenCustomFields = script.getAttribute("data-hidden-custom-fields").toLowerCase().split(",");
+ var hiddenCustomFields = script
+ .getAttribute("data-hidden-custom-fields")
+ .toLowerCase()
+ .split(",");
return {
ids: ids,
path: path,
@@ -1432,7 +1457,7 @@ var MiniProfiler = (function() {
return options.showTotalSqlCount;
},
timestampToRelative: function timestampToRelative(timestamp) {
- var now = Math.round((new Date()).getTime() / 1000);
+ var now = Math.round(new Date().getTime() / 1000);
timestamp = Math.round(timestamp / 1000);
var diff = now - timestamp;
if (diff < 60) {
@@ -1444,7 +1469,7 @@ var MiniProfiler = (function() {
res += "s";
}
return res;
- }
+ };
diff = Math.round(diff / 60);
if (diff <= 60) {
return buildDisplayTime(diff, "minute");
@@ -1459,5 +1484,8 @@ var MiniProfiler = (function() {
};
})();
-window.MiniProfiler = MiniProfiler;
-MiniProfiler.init();
+if (window.MiniProfiler) {
+ _MiniProfiler.patchesApplied = window.MiniProfiler.patchesApplied;
+}
+window.MiniProfiler = _MiniProfiler;
+_MiniProfiler.init();
diff --git a/lib/mini_profiler/asset_version.rb b/lib/mini_profiler/asset_version.rb
index 965b4e9e..725fd3fe 100644
--- a/lib/mini_profiler/asset_version.rb
+++ b/lib/mini_profiler/asset_version.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
module Rack
class MiniProfiler
- ASSET_VERSION = '0ba9230d5e71af3847e6cfcec4963e98'
+ ASSET_VERSION = '10da952c710f6abd9f1bd50fe50ed714'
end
end
| 0
|
cfd0140e2faa250e6e90cbeb4ec2ca4dcceed2f4
|
https://github.com/nextcloud/server/commit/cfd0140e2faa250e6e90cbeb4ec2ca4dcceed2f4
|
fix 2 potential xss problems
|
diff --git a/core/templates/404.php b/core/templates/404.php
index 13a810103434..cd4f2b40bb2e 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -10,6 +10,6 @@
<ul>
<li class='error'>
<?php echo $l->t( 'Cloud not found' ); ?><br/>
- <p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
+ <p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p>
</li>
</ul>
diff --git a/files/templates/index.php b/files/templates/index.php
index f423b96ba1e3..639bdeaead83 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -15,7 +15,7 @@
<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
- <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+ <input type="hidden" name="dir" value="<?php echo htmlentities($_['dir']) ?>" id="dir">
<button class="file_upload_filename"> <img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
<input class="file_upload_start" type="file" name='files[]'/>
<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php
index ab81cc5c0392..16da6bb97b41 100644
--- a/files/templates/part.breadcrumb.php
+++ b/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; ?>
<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'>
- <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a>
+ <a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo htmlentities($crumb["name"]); ?></a>
</div>
<?php endfor;?>
\ No newline at end of file
| 1
|
8249a26d69f72b9cda584c14cc3f12769985e481
|
https://github.com/qpdf/qpdf/commit/8249a26d69f72b9cda584c14cc3f12769985e481
|
Fix infinite loop in QPDFWriter (fixes #143)
|
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index de4fa349..345613ad 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -1054,6 +1054,9 @@ QPDFWriter::enqueueObject(QPDFObjectHandle object)
// here. Instead, enqueue the object stream. Object
// streams always have generation 0.
int stream_id = this->object_to_object_stream[og];
+ // Detect loops by storing invalid object ID 0, which
+ // will get overwritten later.
+ obj_renumber[og] = 0;
enqueueObject(this->pdf.getObjectByID(stream_id, 0));
}
else
@@ -1079,6 +1082,12 @@ QPDFWriter::enqueueObject(QPDFObjectHandle object)
}
}
}
+ else if (obj_renumber[og] == 0)
+ {
+ // This can happen if a specially constructed file
+ // indicates that an object stream is inside itself.
+ QTC::TC("qpdf", "QPDFWriter ignore self-referential object stream");
+ }
}
else if (object.isArray())
{
diff --git a/qpdf/qpdf.testcov b/qpdf/qpdf.testcov
index 0038aa34..f5b628b9 100644
--- a/qpdf/qpdf.testcov
+++ b/qpdf/qpdf.testcov
@@ -294,3 +294,4 @@ QPDF ignore first extra space in xref entry 0
QPDF ignore second extra space in xref entry 0
QPDF ignore length error xref entry 0
QPDF_encryption pad short parameter 0
+QPDFWriter ignore self-referential object stream 0
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index 06f298e0..1aaeb8d4 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -220,6 +220,7 @@ my @bug_tests = (
["106", "zlib data error", 3],
["141a", "/W entry size 0", 2],
["141b", "/W entry size 0", 2],
+ ["143", "self-referential ostream", 3],
);
$n_tests += scalar(@bug_tests);
foreach my $d (@bug_tests)
diff --git a/qpdf/qtest/qpdf/issue-143.out b/qpdf/qtest/qpdf/issue-143.out
new file mode 100644
index 00000000..2bf1e40d
--- /dev/null
+++ b/qpdf/qtest/qpdf/issue-143.out
@@ -0,0 +1,19 @@
+WARNING: issue-143.pdf: can't find PDF header
+WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): stream keyword not followed by proper line terminator
+WARNING: issue-143.pdf (xref stream: object 3 0, file position 607): stream dictionary lacks /Length key
+WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): attempting to recover stream length
+WARNING: issue-143.pdf (xref stream: object 3 0, file position 654): recovered stream length: 36
+WARNING: issue-143.pdf (xref stream: object 3 0, file position 694): expected endobj
+WARNING: issue-143.pdf: file is damaged
+WARNING: issue-143.pdf (object 1 0, file position 48): expected n n obj
+WARNING: issue-143.pdf: Attempting to reconstruct cross-reference table
+WARNING: issue-143.pdf (file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake1
+WARNING: issue-143.pdf (file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake2
+WARNING: issue-143.pdf (file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake3
+WARNING: issue-143.pdf (file position 24): expected dictionary key but found non-name object; inserting key /QPDFFake4
+WARNING: issue-143.pdf (object 1 0, file position 21): stream dictionary lacks /Length key
+WARNING: issue-143.pdf (object 1 0, file position 84): attempting to recover stream length
+WARNING: issue-143.pdf (object 1 0, file position 84): recovered stream length: 606
+WARNING: issue-143.pdf (object 1 0, file position 694): expected endobj
+WARNING: object stream 1 (file position 33): expected dictionary key but found non-name object; inserting key /QPDFFake1
+qpdf: operation succeeded with warnings; resulting file may have some problems
diff --git a/qpdf/qtest/qpdf/issue-143.pdf b/qpdf/qtest/qpdf/issue-143.pdf
new file mode 100644
index 00000000..b4546036
Binary files /dev/null and b/qpdf/qtest/qpdf/issue-143.pdf differ
| 1
|
3bbbbf3da469f457881b5af902eb0b89b95189a2
|
https://github.com/octobercms/library/commit/3bbbbf3da469f457881b5af902eb0b89b95189a2
|
Remove SVG from image types
SVG files should not be treated as images - especially when coming to uploads. An SVG file can contain arbitrary HTML data as well as event handlers in native elements
Refs: https://html5sec.org/#svg
Original report by: Ishaq Mohammed
|
diff --git a/src/Filesystem/Definitions.php b/src/Filesystem/Definitions.php
index baa4d9812..63660e464 100644
--- a/src/Filesystem/Definitions.php
+++ b/src/Filesystem/Definitions.php
@@ -182,8 +182,7 @@ protected function imageExtensions()
'bmp',
'png',
'webp',
- 'gif',
- 'svg'
+ 'gif'
];
}
| 1
|
a6c7caff427c3d4f9cfb0e5b193603b4e2972286
|
https://github.com/apache/geronimo/commit/a6c7caff427c3d4f9cfb0e5b193603b4e2972286
|
GERONIMO-6281 Use o.a.g.server.dir as the prefix to activemq.data path in order to generate the activemq datastore in the instance folder, for 3.0 trunk
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1292632 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/plugins/activemq/activemq-broker-blueprint/pom.xml b/plugins/activemq/activemq-broker-blueprint/pom.xml
index c27fb929cb..90b6159b70 100644
--- a/plugins/activemq/activemq-broker-blueprint/pom.xml
+++ b/plugins/activemq/activemq-broker-blueprint/pom.xml
@@ -154,7 +154,7 @@
-->
<config-substitution key="ActiveMQPort">61616</config-substitution>
<config-substitution key="activemq.brokerName">DefaultActiveMQBroker</config-substitution>
- <config-substitution key="activemq.data">var/activemq</config-substitution>
+ <config-substitution key="activemq.data">${org.apache.geronimo.server.dir}/var/activemq</config-substitution>
</plugin-artifact>
</instance>
</configuration>
| 0
|
4fdc51a40bf9532d7db57d0b08c1aec3931468ad
|
https://github.com/apache/tika/commit/4fdc51a40bf9532d7db57d0b08c1aec3931468ad
|
followup fix
|
diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index 2becf07d32..d8795f715d 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -198,20 +198,26 @@ private static void processHeaderConfig(MultivaluedMap<String, String> httpHeade
try {
String property = StringUtils.removeStart(key, prefix);
+ Field field = null;
+ try {
+ object.getClass().getDeclaredField(StringUtils.uncapitalize(property));
+ } catch (NoSuchFieldException e) {
+ //swallow
+ }
String setter = property;
setter = "set"+setter.substring(0,1).toUpperCase(Locale.US)+setter.substring(1);
- Field field = object.getClass().getDeclaredField(StringUtils.uncapitalize(property));
//default assume string class
//if there's a more specific type, e.g. double, int, boolean
//try that.
Class clazz = String.class;
-
- if (field.getType() == int.class) {
- clazz = int.class;
- } else if (field.getType() == double.class) {
- clazz = double.class;
- } else if (field.getType() == boolean.class) {
- clazz = boolean.class;
+ if (field != null) {
+ if (field.getType() == int.class) {
+ clazz = int.class;
+ } else if (field.getType() == double.class) {
+ clazz = double.class;
+ } else if (field.getType() == boolean.class) {
+ clazz = boolean.class;
+ }
}
Method m = tryToGetMethod(object, setter, clazz);
diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
index 9e624f8dd9..bd86fd83b7 100644
--- a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
@@ -301,4 +301,17 @@ public void testDataIntegrityCheck() throws Exception {
.put(ClassLoader.getSystemResourceAsStream("testOCR.pdf"));
assertEquals(200, response.getStatus());
}
+
+ @Test
+ public void testTrustedMethodPrevention() {
+ Response response = WebClient.create(endPoint + TIKA_PATH)
+ .type("application/pdf")
+ .accept("text/plain")
+ .header(TikaResource.X_TIKA_OCR_HEADER_PREFIX +
+ "trustedPageSeparator",
+ "\u0010")
+ .put(ClassLoader.getSystemResourceAsStream("testOCR.pdf"));
+ assertEquals(500, response.getStatus());
+
+ }
}
| 1
|
fad95df78681894f8e54a7867e738572f413dd30
|
https://github.com/libarchive/libarchive/commit/fad95df78681894f8e54a7867e738572f413dd30
|
zip writer: don't append unused NUL for directories
This can result in a heap overflow dependening on the buffer allocation.
Simplify the path length calculation and avoid binary operands.
Based on PR #1255 from Will Wagner
|
diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index 7fcd1a07b..f28a8c3a3 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -1402,18 +1402,17 @@ path_length(struct archive_entry *entry)
{
mode_t type;
const char *path;
+ size_t len;
type = archive_entry_filetype(entry);
path = archive_entry_pathname(entry);
if (path == NULL)
return (0);
- if (type == AE_IFDIR &&
- (path[0] == '\0' || path[strlen(path) - 1] != '/')) {
- return strlen(path) + 1;
- } else {
- return strlen(path);
- }
+ len = strlen(path);
+ if (type == AE_IFDIR && (path[0] == '\0' || path[len - 1] != '/'))
+ ++len; /* Space for the trailing / */
+ return len;
}
static int
@@ -1461,10 +1460,8 @@ copy_path(struct archive_entry *entry, unsigned char *p)
memcpy(p, path, pathlen);
/* Folders are recognized by a trailing slash. */
- if ((type == AE_IFDIR) & (path[pathlen - 1] != '/')) {
+ if ((type == AE_IFDIR) && (path[pathlen - 1] != '/'))
p[pathlen] = '/';
- p[pathlen + 1] = '\0';
- }
}
| 0
|
d27790dfdde09a58db15064bbdaf77d224f61ecc
|
https://github.com/apache/atlas/commit/d27790dfdde09a58db15064bbdaf77d224f61ecc
|
ATLAS-4099: Removed trailing path separator from adls_gen2_directory qualifiedName
Signed-off-by: Sarath Subramanian <[email protected]>
|
diff --git a/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java b/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java
index 0e4b507ff4..81f847e755 100644
--- a/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java
+++ b/common/src/main/java/org/apache/atlas/utils/AtlasPathExtractorUtil.java
@@ -315,7 +315,7 @@ private static AtlasEntity addAbfsPathEntity(Path path, AtlasEntityExtInfo extIn
continue;
}
- String subDirPath = parentPath + subDirName + Path.SEPARATOR;
+ String subDirPath = parentPath + subDirName;
String subDirQualifiedName = schemeAndContainerName + subDirPath + QNAME_SEP_METADATA_NAMESPACE + metadataNamespace;
ret = new AtlasEntity(ADLS_GEN2_DIRECTORY);
@@ -331,7 +331,7 @@ private static AtlasEntity addAbfsPathEntity(Path path, AtlasEntityExtInfo extIn
context.putEntity(subDirQualifiedName, ret);
parentObjId = AtlasTypeUtil.getAtlasRelatedObjectId(ret, RELATIONSHIP_ADLS_GEN2_PARENT_CHILDREN);
- parentPath = subDirPath;
+ parentPath = subDirPath + Path.SEPARATOR;
}
if (ret == null) {
@@ -516,4 +516,4 @@ private static String getQualifiedName(String path, String metadataNamespace) {
return path.toLowerCase();
}
-}
\ No newline at end of file
+}
diff --git a/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java b/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java
index 2d2ff2c474..dbc5000435 100644
--- a/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java
+++ b/common/src/test/java/org/apache/atlas/utils/AtlasPathExtractorUtilTest.java
@@ -304,17 +304,17 @@ private void verifyHDFSEntity(AtlasEntity entity, boolean toLowerCase) {
}
private void verifyABFSAdlsGen2Dir(String abfsScheme, String path, AtlasEntity entity){
- String pathQName = abfsScheme + "data@razrangersan/tmp/cdp-demo/sample.csv/" + QNAME_METADATA_NAMESPACE;
+ String pathQName = abfsScheme + "data@razrangersan/tmp/cdp-demo/sample.csv" + QNAME_METADATA_NAMESPACE;
String entityQName = (String) entity.getAttribute(ATTRIBUTE_QUALIFIED_NAME);
if (pathQName.equalsIgnoreCase(entityQName)){
assertEquals(entity.getAttribute(ATTRIBUTE_NAME), "sample.csv");
} else {
- pathQName = abfsScheme + "data@razrangersan/tmp/cdp-demo/" + QNAME_METADATA_NAMESPACE;
+ pathQName = abfsScheme + "data@razrangersan/tmp/cdp-demo" + QNAME_METADATA_NAMESPACE;
if (pathQName.equalsIgnoreCase(entityQName)){
assertEquals(entity.getAttribute(ATTRIBUTE_NAME), "cdp-demo");
} else {
- assertEquals(entity.getAttribute(ATTRIBUTE_QUALIFIED_NAME), abfsScheme + "data@razrangersan/tmp/" + QNAME_METADATA_NAMESPACE);
+ assertEquals(entity.getAttribute(ATTRIBUTE_QUALIFIED_NAME), abfsScheme + "data@razrangersan/tmp" + QNAME_METADATA_NAMESPACE);
assertEquals(entity.getAttribute(ATTRIBUTE_NAME), "tmp");
}
}
| 0
|
935b9716cd12ac06a17e2d6f4e8f09dcd51cd9d8
|
https://github.com/ZF-Commons/ZfcUser/commit/935b9716cd12ac06a17e2d6f4e8f09dcd51cd9d8
|
Update README.md
|
diff --git a/README.md b/README.md
index de8da695..9790901f 100644
--- a/README.md
+++ b/README.md
@@ -71,9 +71,9 @@ Installation
1. Add this project and [ZfcBase](https://github.com/ZF-Commons/ZfcBase) in your composer.json:
```json
- "require": {
- "zf-commons/zfc-user": "^3.0"
- }
+ "require": {
+ "zf-commons/zfc-user": "^3.0"
+ }
```
2. Now tell composer to download ZfcUser by running the command:
| 0
|
ed1f6eed583f559c263561d528dce08c3bde72cd
|
https://github.com/WBCE/WBCE_CMS/commit/ed1f6eed583f559c263561d528dce08c3bde72cd
|
PHPMailer 6.2.0
|
diff --git a/wbce/include/PHPMailer/README.md b/wbce/include/PHPMailer/README.md
index c287e307..d9cbbaaf 100644
--- a/wbce/include/PHPMailer/README.md
+++ b/wbce/include/PHPMailer/README.md
@@ -167,15 +167,9 @@ Build status: [](h
If this isn't passing, is there something you can do to help?
## Security
-Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
-PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
-
-PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
-
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
-
-See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues.
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for details on security issues.
## Contributing
Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
diff --git a/wbce/include/PHPMailer/VERSION b/wbce/include/PHPMailer/VERSION
index aeee9f77..4ac4fded 100644
--- a/wbce/include/PHPMailer/VERSION
+++ b/wbce/include/PHPMailer/VERSION
@@ -1 +1 @@
-6.1.8
\ No newline at end of file
+6.2.0
\ No newline at end of file
diff --git a/wbce/include/PHPMailer/composer.json b/wbce/include/PHPMailer/composer.json
index 95a89919..7388bd98 100644
--- a/wbce/include/PHPMailer/composer.json
+++ b/wbce/include/PHPMailer/composer.json
@@ -21,7 +21,7 @@
],
"funding": [
{
- "url": "https://github.com/synchro",
+ "url": "https://github.com/Synchro",
"type": "github"
}
],
@@ -32,16 +32,19 @@
"ext-hash": "*"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.2",
- "phpunit/phpunit": "^4.8 || ^5.7",
- "doctrine/annotations": "^1.2"
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "doctrine/annotations": "^1.2",
+ "phpcompatibility/php-compatibility": "^9.3.5",
+ "roave/security-advisories": "dev-latest",
+ "squizlabs/php_codesniffer": "^3.5.6",
+ "yoast/phpunit-polyfills": "^0.2.0"
},
"suggest": {
- "psr/log": "For optional PSR-3 debug logging",
- "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "ext-mbstring": "Needed to send email in multibyte encoding charset",
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+ "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "psr/log": "For optional PSR-3 debug logging",
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
- "ext-mbstring": "Needed to send email in multibyte encoding charset",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
},
"autoload": {
diff --git a/wbce/include/PHPMailer/get_oauth_token.php b/wbce/include/PHPMailer/get_oauth_token.php
index 8335883a..560d3645 100644
--- a/wbce/include/PHPMailer/get_oauth_token.php
+++ b/wbce/include/PHPMailer/get_oauth_token.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5
@@ -16,6 +17,7 @@
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE.
*/
+
/**
* Get an OAuth2 token from an OAuth2 provider.
* * Install this script on your server so that it's accessible
@@ -44,7 +46,7 @@
use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
if (!isset($_GET['code']) && !isset($_GET['provider'])) {
-?>
+ ?>
<html>
<body>Select Provider:<br/>
<a href='?provider=Google'>Google</a><br/>
@@ -52,8 +54,8 @@
<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
</body>
</html>
-<?php
-exit;
+ <?php
+ exit;
}
require 'vendor/autoload.php';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-af.php b/wbce/include/PHPMailer/language/phpmailer.lang-af.php
index 3c42d78e..0b2a72d5 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-af.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-af.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Afrikaans PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ar.php b/wbce/include/PHPMailer/language/phpmailer.lang-ar.php
index 865d0b73..8ab485c4 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ar.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ar.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Arabic PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-az.php b/wbce/include/PHPMailer/language/phpmailer.lang-az.php
index 3749d83d..552167ef 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-az.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-az.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Azerbaijani PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ba.php b/wbce/include/PHPMailer/language/phpmailer.lang-ba.php
index 576c4bb5..3694f344 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ba.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ba.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Bosnian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -23,4 +24,4 @@
$PHPMAILER_LANG['smtp_connect_failed'] = 'Spajanje na SMTP server nije uspjelo.';
$PHPMAILER_LANG['smtp_error'] = 'SMTP greška: ';
$PHPMAILER_LANG['variable_set'] = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
-$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
\ No newline at end of file
+$PHPMAILER_LANG['extension_missing'] = 'Nedostaje ekstenzija: ';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-be.php b/wbce/include/PHPMailer/language/phpmailer.lang-be.php
index e2f98f0f..9e92ddaa 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-be.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-be.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Belarusian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-bg.php b/wbce/include/PHPMailer/language/phpmailer.lang-bg.php
index b22941f6..c41f675d 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-bg.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-bg.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Bulgarian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ca.php b/wbce/include/PHPMailer/language/phpmailer.lang-ca.php
index 4117596c..34684855 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ca.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ca.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Catalan PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ch.php b/wbce/include/PHPMailer/language/phpmailer.lang-ch.php
index 4fda6b85..500c9526 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ch.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ch.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-cs.php b/wbce/include/PHPMailer/language/phpmailer.lang-cs.php
index 1160cf0c..55bdd9c8 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-cs.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-cs.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Czech PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-da.php b/wbce/include/PHPMailer/language/phpmailer.lang-da.php
index 5febb516..1edba1d7 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-da.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-da.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Danish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author John Sebastian <[email protected]>
- * Rewrite and extension of the work by Mikael Stokkebro <[email protected]>
- *
+ * Rewrite and extension of the work by Mikael Stokkebro <[email protected]>
+ *
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Login mislykkedes.';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-de.php b/wbce/include/PHPMailer/language/phpmailer.lang-de.php
index b36c6cbd..e7e59d2b 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-de.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-de.php
@@ -1,4 +1,5 @@
<?php
+
/**
* German PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-el.php b/wbce/include/PHPMailer/language/phpmailer.lang-el.php
index 7109641e..b3d5ca94 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-el.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-el.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Greek PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-eo.php b/wbce/include/PHPMailer/language/phpmailer.lang-eo.php
index 5ca6cb70..fa8c2c17 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-eo.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-eo.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Esperanto PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-es.php b/wbce/include/PHPMailer/language/phpmailer.lang-es.php
index f2c4e831..6ba74627 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-es.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-es.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Spanish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-et.php b/wbce/include/PHPMailer/language/phpmailer.lang-et.php
index 7e06da13..93addc9e 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-et.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-et.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Estonian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-fa.php b/wbce/include/PHPMailer/language/phpmailer.lang-fa.php
index 8aa0ad22..295a47f9 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-fa.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-fa.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Persian/Farsi PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-fi.php b/wbce/include/PHPMailer/language/phpmailer.lang-fi.php
index ec4e7523..243c0548 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-fi.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-fi.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Finnish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-fo.php b/wbce/include/PHPMailer/language/phpmailer.lang-fo.php
index 68cdef1d..b30f0520 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-fo.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-fo.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Faroese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-fr.php b/wbce/include/PHPMailer/language/phpmailer.lang-fr.php
index af68c923..b57f0ec6 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-fr.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-fr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* French PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -19,6 +20,8 @@
$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échoué : ';
$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.';
$PHPMAILER_LANG['invalid_address'] = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'L\'entrée hôte n\'est pas valide : ';
+$PHPMAILER_LANG['invalid_host'] = 'L\'hôte n\'est pas valide : ';
$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
$PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.';
$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-gl.php b/wbce/include/PHPMailer/language/phpmailer.lang-gl.php
index 9b4ce4d8..3f3ab376 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-gl.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-gl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Galician PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-he.php b/wbce/include/PHPMailer/language/phpmailer.lang-he.php
index 70eb7175..b123aa5f 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-he.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-he.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Hebrew PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-hi.php b/wbce/include/PHPMailer/language/phpmailer.lang-hi.php
index 607a5ee3..d973a359 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-hi.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-hi.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Hindi PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Yash Karanke <[email protected]>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
$PHPMAILER_LANG['connect_host'] = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-hr.php b/wbce/include/PHPMailer/language/phpmailer.lang-hr.php
index 3822920a..cacb6c37 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-hr.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-hr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Croatian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-hu.php b/wbce/include/PHPMailer/language/phpmailer.lang-hu.php
index 196cddc2..e6b58b0d 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-hu.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-hu.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Hungarian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-hy.php b/wbce/include/PHPMailer/language/phpmailer.lang-hy.php
index ff2a9695..bb05d2d9 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-hy.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-hy.php
@@ -1,10 +1,11 @@
<?php
+
/**
* Armenian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Hrayr Grigoryan <[email protected]>
*/
-
+
$PHPMAILER_LANG['authenticate'] = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.';
$PHPMAILER_LANG['connect_host'] = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP -ի սխալ: տվյալները ընդունված չեն.';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-id.php b/wbce/include/PHPMailer/language/phpmailer.lang-id.php
index 1353baba..212a11f1 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-id.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-id.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Indonesian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-it.php b/wbce/include/PHPMailer/language/phpmailer.lang-it.php
index e67b6f72..08a6b733 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-it.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-it.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Italian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ja.php b/wbce/include/PHPMailer/language/phpmailer.lang-ja.php
index 2d778728..eee79898 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ja.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ja.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Japanese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ka.php b/wbce/include/PHPMailer/language/phpmailer.lang-ka.php
index dd1af8ab..51fe403b 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ka.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ka.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Georgian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ko.php b/wbce/include/PHPMailer/language/phpmailer.lang-ko.php
index 9599fa68..8c97dd94 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ko.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ko.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Korean PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-lt.php b/wbce/include/PHPMailer/language/phpmailer.lang-lt.php
index 1253a4fd..4f115b1c 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-lt.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-lt.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Lithuanian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-lv.php b/wbce/include/PHPMailer/language/phpmailer.lang-lv.php
index 39bf9a19..679b18cf 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-lv.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-lv.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Latvian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-mg.php b/wbce/include/PHPMailer/language/phpmailer.lang-mg.php
index f4c75630..8a94f6a0 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-mg.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-mg.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Malagasy PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Hackinet <[email protected]>
*/
+
$PHPMAILER_LANG['authenticate'] = 'Hadisoana SMTP: Tsy nahomby ny fanamarinana.';
$PHPMAILER_LANG['connect_host'] = 'SMTP Error: Tsy afaka mampifandray amin\'ny mpampiantrano SMTP.';
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP diso: tsy voarakitra ny angona.';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ms.php b/wbce/include/PHPMailer/language/phpmailer.lang-ms.php
index f12a6ad4..71db3383 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ms.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ms.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Malaysian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-nb.php b/wbce/include/PHPMailer/language/phpmailer.lang-nb.php
index 97403e73..65793ce2 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-nb.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-nb.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-nl.php b/wbce/include/PHPMailer/language/phpmailer.lang-nl.php
index f4d0e7cd..bf41ade8 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-nl.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-nl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-pl.php b/wbce/include/PHPMailer/language/phpmailer.lang-pl.php
index 3da0dee9..23caa71b 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-pl.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-pl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Polish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
@@ -14,7 +15,7 @@
$PHPMAILER_LANG['file_open'] = 'Nie można otworzyć pliku: ';
$PHPMAILER_LANG['from_failed'] = 'Następujący adres Nadawcy jest nieprawidłowy: ';
$PHPMAILER_LANG['instantiate'] = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, '.
+$PHPMAILER_LANG['invalid_address'] = 'Nie można wysłać wiadomości, ' .
'następujący adres Odbiorcy jest nieprawidłowy: ';
$PHPMAILER_LANG['provide_address'] = 'Należy podać prawidłowy adres email Odbiorcy.';
$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-pt.php b/wbce/include/PHPMailer/language/phpmailer.lang-pt.php
index f365d5d0..f1ce946e 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-pt.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-pt.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Portuguese (European) PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-pt_br.php b/wbce/include/PHPMailer/language/phpmailer.lang-pt_br.php
index 62d692d4..d8638098 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-pt_br.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-pt_br.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ro.php b/wbce/include/PHPMailer/language/phpmailer.lang-ro.php
index fa100eaa..292ec1e4 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ro.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ro.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Romanian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-ru.php b/wbce/include/PHPMailer/language/phpmailer.lang-ru.php
index 720e9a11..8c8c5e81 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-ru.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-ru.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Russian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-sk.php b/wbce/include/PHPMailer/language/phpmailer.lang-sk.php
index 69cfb0fc..a1cfb288 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-sk.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-sk.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Slovak PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-sl.php b/wbce/include/PHPMailer/language/phpmailer.lang-sl.php
index 1e3cb7fa..c437a886 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-sl.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-sl.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Slovene PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
* @author Klemen Tušar <[email protected]>
* @author Filip Š <[email protected]>
+ * @author Blaž Oražem <[email protected]>
*/
$PHPMAILER_LANG['authenticate'] = 'SMTP napaka: Avtentikacija ni uspela.';
@@ -17,8 +19,10 @@
$PHPMAILER_LANG['from_failed'] = 'Neveljaven e-naslov pošiljatelja: ';
$PHPMAILER_LANG['instantiate'] = 'Ne morem inicializirati mail funkcije.';
$PHPMAILER_LANG['invalid_address'] = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['invalid_hostentry'] = 'Neveljaven vnos gostitelja: ';
+$PHPMAILER_LANG['invalid_host'] = 'Neveljaven gostitelj: ';
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
-$PHPMAILER_LANG['provide_address'] = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['provide_address'] = 'Prosimo, vnesite vsaj enega naslovnika.';
$PHPMAILER_LANG['recipients_failed'] = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
$PHPMAILER_LANG['signing'] = 'Napaka pri podpisovanju: ';
$PHPMAILER_LANG['smtp_connect_failed'] = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-sr.php b/wbce/include/PHPMailer/language/phpmailer.lang-sr.php
index 34c1e182..0b5280f7 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-sr.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-sr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Serbian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-sv.php b/wbce/include/PHPMailer/language/phpmailer.lang-sv.php
index c78237e7..9872c192 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-sv.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-sv.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Swedish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-tl.php b/wbce/include/PHPMailer/language/phpmailer.lang-tl.php
index cd91f752..d15bed1c 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-tl.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-tl.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Tagalog PHPMailer language file: refer to English translation for definitive list
*
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-tr.php b/wbce/include/PHPMailer/language/phpmailer.lang-tr.php
index cfe8eaae..f938f802 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-tr.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-tr.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Turkish PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-uk.php b/wbce/include/PHPMailer/language/phpmailer.lang-uk.php
index fcd77ade..9fa60cf1 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-uk.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-uk.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Ukrainian PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-vi.php b/wbce/include/PHPMailer/language/phpmailer.lang-vi.php
index c60dadeb..d65576e2 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-vi.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-vi.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list.
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-zh.php b/wbce/include/PHPMailer/language/phpmailer.lang-zh.php
index 3e9e358c..35e4e700 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-zh.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-zh.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Traditional Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/language/phpmailer.lang-zh_cn.php b/wbce/include/PHPMailer/language/phpmailer.lang-zh_cn.php
index 37537802..728a4994 100644
--- a/wbce/include/PHPMailer/language/phpmailer.lang-zh_cn.php
+++ b/wbce/include/PHPMailer/language/phpmailer.lang-zh_cn.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Simplified Chinese PHPMailer language file: refer to English translation for definitive list
* @package PHPMailer
diff --git a/wbce/include/PHPMailer/src/Exception.php b/wbce/include/PHPMailer/src/Exception.php
index e7807fc2..a50a8991 100644
--- a/wbce/include/PHPMailer/src/Exception.php
+++ b/wbce/include/PHPMailer/src/Exception.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer Exception class.
* PHP Version 5.5.
diff --git a/wbce/include/PHPMailer/src/OAuth.php b/wbce/include/PHPMailer/src/OAuth.php
index 753aac94..07fde4c8 100644
--- a/wbce/include/PHPMailer/src/OAuth.php
+++ b/wbce/include/PHPMailer/src/OAuth.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5.
diff --git a/wbce/include/PHPMailer/src/PHPMailer.php b/wbce/include/PHPMailer/src/PHPMailer.php
index f9498b1b..c8fc1a82 100644
--- a/wbce/include/PHPMailer/src/PHPMailer.php
+++ b/wbce/include/PHPMailer/src/PHPMailer.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer - PHP email creation and transport class.
* PHP Version 5.5.
@@ -388,11 +389,11 @@ class PHPMailer
* SMTP class debug output mode.
* Debug output level.
* Options:
- * * SMTP::DEBUG_OFF: No output
- * * SMTP::DEBUG_CLIENT: Client messages
- * * SMTP::DEBUG_SERVER: Client and server messages
- * * SMTP::DEBUG_CONNECTION: As SERVER plus connection status
- * * SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
+ * @see SMTP::DEBUG_OFF: No output
+ * @see SMTP::DEBUG_CLIENT: Client messages
+ * @see SMTP::DEBUG_SERVER: Client and server messages
+ * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
+ * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
*
* @see SMTP::$do_debug
*
@@ -747,7 +748,7 @@ class PHPMailer
*
* @var string
*/
- const VERSION = '6.1.8';
+ const VERSION = '6.2.0';
/**
* Error severity: message only, continue processing.
@@ -1185,9 +1186,11 @@ public static function parseAddresses($addrstr, $useimap = true)
//Use this built-in parser if it's available
$list = imap_rfc822_parse_adrlist($addrstr, '');
foreach ($list as $address) {
- if (('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
- $address->mailbox . '@' . $address->host
- )) {
+ if (
+ ('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
+ $address->mailbox . '@' . $address->host
+ )
+ ) {
$addresses[] = [
'name' => (property_exists($address, 'personal') ? $address->personal : ''),
'address' => $address->mailbox . '@' . $address->host,
@@ -1241,7 +1244,8 @@ public function setFrom($address, $name = '', $auto = true)
$name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
// Don't validate now addresses with IDN. Will be done in send().
$pos = strrpos($address, '@');
- if ((false === $pos)
+ if (
+ (false === $pos)
|| ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
&& !static::validateAddress($address))
) {
@@ -1393,7 +1397,8 @@ public function punyencodeAddress($address)
{
// Verify we have required functions, CharSet, and at-sign.
$pos = strrpos($address, '@');
- if (!empty($this->CharSet) &&
+ if (
+ !empty($this->CharSet) &&
false !== $pos &&
static::idnSupported()
) {
@@ -1455,8 +1460,9 @@ public function send()
*/
public function preSend()
{
- if ('smtp' === $this->Mailer
- || ('mail' === $this->Mailer && stripos(PHP_OS, 'WIN') === 0)
+ if (
+ 'smtp' === $this->Mailer
+ || ('mail' === $this->Mailer && (PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
) {
//SMTP mandates RFC-compliant line endings
//and it's also used with mail() on Windows
@@ -1466,7 +1472,8 @@ public function preSend()
static::setLE(PHP_EOL);
}
//Check for buggy PHP versions that add a header with an incorrect line break
- if ('mail' === $this->Mailer
+ if (
+ 'mail' === $this->Mailer
&& ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70017)
|| (PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70103))
&& ini_get('mail.add_x_header') === '1'
@@ -1553,7 +1560,8 @@ public function preSend()
}
// Sign with DKIM if enabled
- if (!empty($this->DKIM_domain)
+ if (
+ !empty($this->DKIM_domain)
&& !empty($this->DKIM_selector)
&& (!empty($this->DKIM_private_string)
|| (!empty($this->DKIM_private)
@@ -1611,7 +1619,7 @@ public function postSend()
}
} catch (Exception $exc) {
if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
- $this->smtp->reset();
+ $this->smtp->reset();
}
$this->setError($exc->getMessage());
$this->edebug($exc->getMessage());
@@ -1717,7 +1725,8 @@ protected function sendmailSend($header, $body)
protected static function isShellSafe($string)
{
// Future-proof
- if (escapeshellcmd($string) !== $string
+ if (
+ escapeshellcmd($string) !== $string
|| !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
) {
return false;
@@ -1901,7 +1910,7 @@ protected function smtpSend($header, $body)
$isSent = true;
}
- $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
+ $callbacks[] = ['issent' => $isSent, 'to' => $to[0]];
}
}
@@ -1981,11 +1990,13 @@ public function smtpConnect($options = null)
foreach ($hosts as $hostentry) {
$hostinfo = [];
- if (!preg_match(
- '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
- trim($hostentry),
- $hostinfo
- )) {
+ if (
+ !preg_match(
+ '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
+ trim($hostentry),
+ $hostinfo
+ )
+ ) {
$this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
// Not a valid host entry
continue;
@@ -2054,12 +2065,14 @@ public function smtpConnect($options = null)
// We must resend EHLO after TLS negotiation
$this->smtp->hello($hello);
}
- if ($this->SMTPAuth && !$this->smtp->authenticate(
- $this->Username,
- $this->Password,
- $this->AuthType,
- $this->oauth
- )) {
+ if (
+ $this->SMTPAuth && !$this->smtp->authenticate(
+ $this->Username,
+ $this->Password,
+ $this->AuthType,
+ $this->oauth
+ )
+ ) {
throw new Exception($this->lang('authenticate'));
}
@@ -2117,7 +2130,7 @@ public function setLanguage($langcode = 'en', $lang_path = '')
'am' => 'hy',
];
- if (isset($renamed_langcodes[$langcode])) {
+ if (array_key_exists($langcode, $renamed_langcodes)) {
$langcode = $renamed_langcodes[$langcode];
}
@@ -2426,7 +2439,8 @@ public function createHeader()
}
// sendmail and mail() extract Bcc from the header before sending
- if ((
+ if (
+ (
'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
)
&& count($this->bcc) > 0
@@ -3896,7 +3910,8 @@ protected function serverHostname()
public static function isValidHost($host)
{
//Simple syntax limits
- if (empty($host)
+ if (
+ empty($host)
|| !is_string($host)
|| strlen($host) > 256
|| !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
@@ -4062,7 +4077,8 @@ public function msgHTML($message, $basedir = '', $advanced = false)
);
continue;
}
- if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+ if (
+ // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
!empty($basedir)
// Ignore URLs containing parent dir traversal (..)
&& (strpos($url, '..') === false)
@@ -4084,13 +4100,14 @@ public function msgHTML($message, $basedir = '', $advanced = false)
if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
$directory .= '/';
}
- if ($this->addEmbeddedImage(
- $basedir . $directory . $filename,
- $cid,
- $filename,
- static::ENCODING_BASE64,
- static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
- )
+ if (
+ $this->addEmbeddedImage(
+ $basedir . $directory . $filename,
+ $cid,
+ $filename,
+ static::ENCODING_BASE64,
+ static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+ )
) {
$message = preg_replace(
'/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
@@ -4509,11 +4526,15 @@ public function DKIM_Sign($signHeader)
$privKey = openssl_pkey_get_private($privKeyStr);
}
if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
- openssl_pkey_free($privKey);
+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
return base64_encode($signature);
}
- openssl_pkey_free($privKey);
+ if (PHP_MAJOR_VERSION < 8) {
+ openssl_pkey_free($privKey);
+ }
return '';
}
diff --git a/wbce/include/PHPMailer/src/POP3.php b/wbce/include/PHPMailer/src/POP3.php
index a6a41284..235e6372 100644
--- a/wbce/include/PHPMailer/src/POP3.php
+++ b/wbce/include/PHPMailer/src/POP3.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer POP-Before-SMTP Authentication Class.
* PHP Version 5.5.
@@ -45,7 +46,7 @@ class POP3
*
* @var string
*/
- const VERSION = '6.1.8';
+ const VERSION = '6.2.0';
/**
* Default POP3 port number.
@@ -62,12 +63,16 @@ class POP3
const DEFAULT_TIMEOUT = 30;
/**
- * Debug display level.
- * Options: 0 = no, 1+ = yes.
+ * POP3 class debug output mode.
+ * Debug output level.
+ * Options:
+ * @see POP3::DEBUG_OFF: No output
+ * @see POP3::DEBUG_SERVER: Server messages, connection/server errors
+ * @see POP3::DEBUG_CLIENT: Client and Server messages, connection/server errors
*
* @var int
*/
- public $do_debug = 0;
+ public $do_debug = self::DEBUG_OFF;
/**
* POP3 mail server hostname.
@@ -130,6 +135,28 @@ class POP3
*/
const LE = "\r\n";
+ /**
+ * Debug level for no output.
+ *
+ * @var int
+ */
+ const DEBUG_OFF = 0;
+
+ /**
+ * Debug level to show server -> client messages
+ * also shows clients connection errors or errors from server
+ *
+ * @var int
+ */
+ const DEBUG_SERVER = 1;
+
+ /**
+ * Debug level to show client -> server and server -> client messages.
+ *
+ * @var int
+ */
+ const DEBUG_CLIENT = 2;
+
/**
* Simple static wrapper for all-in-one POP before SMTP.
*
@@ -329,7 +356,7 @@ public function disconnect()
protected function getResponse($size = 128)
{
$response = fgets($this->pop_conn, $size);
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo 'Server -> Client: ', $response;
}
@@ -346,7 +373,7 @@ protected function getResponse($size = 128)
protected function sendString($string)
{
if ($this->pop_conn) {
- if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+ if ($this->do_debug >= self::DEBUG_CLIENT) { //Show client messages when debug >= 2
echo 'Client -> Server: ', $string;
}
@@ -384,7 +411,7 @@ protected function checkResponse($string)
protected function setError($error)
{
$this->errors[] = $error;
- if ($this->do_debug >= 1) {
+ if ($this->do_debug >= self::DEBUG_SERVER) {
echo '<pre>';
foreach ($this->errors as $e) {
print_r($e);
diff --git a/wbce/include/PHPMailer/src/SMTP.php b/wbce/include/PHPMailer/src/SMTP.php
index 9e43dce2..ab7f46e4 100644
--- a/wbce/include/PHPMailer/src/SMTP.php
+++ b/wbce/include/PHPMailer/src/SMTP.php
@@ -1,4 +1,5 @@
<?php
+
/**
* PHPMailer RFC821 SMTP email transport class.
* PHP Version 5.5.
@@ -34,7 +35,7 @@ class SMTP
*
* @var string
*/
- const VERSION = '6.1.8';
+ const VERSION = '6.2.0';
/**
* SMTP line break constant.
@@ -539,11 +540,12 @@ public function authenticate(
return false;
}
// Send encoded username and password
- if (!$this->sendCommand(
- 'User & Password',
- base64_encode("\0" . $username . "\0" . $password),
- 235
- )
+ if (
+ !$this->sendCommand(
+ 'User & Password',
+ base64_encode("\0" . $username . "\0" . $password),
+ 235
+ )
) {
return false;
}
@@ -1086,8 +1088,10 @@ public function client_send($data, $command = '')
{
//If SMTP transcripts are left enabled, or debug output is posted online
//it can leak credentials, so hide credentials in all but lowest level
- if (self::DEBUG_LOWLEVEL > $this->do_debug &&
- in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+ if (
+ self::DEBUG_LOWLEVEL > $this->do_debug &&
+ in_array($command, ['User & Password', 'Username', 'Password'], true)
+ ) {
$this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
} else {
$this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
@@ -1207,7 +1211,8 @@ protected function get_lines()
self::DEBUG_LOWLEVEL
);
- //stream_select returns false when the `select` system call is interrupted by an incoming signal, try the select again
+ //stream_select returns false when the `select` system call is interrupted
+ //by an incoming signal, try the select again
if (stripos($message, 'interrupted system call') !== false) {
$this->edebug(
'SMTP -> get_lines(): retrying stream_select',
| 0
|
a9568ea7fe7ca78277eb8f6ec407baa8ebd8fec5
|
https://github.com/jenkinsci/kubernetes-plugin/commit/a9568ea7fe7ca78277eb8f6ec407baa8ebd8fec5
|
Spotbugs
|
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesProvisioningLimits.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesProvisioningLimits.java
index bc3ac5a1f0..7889277b6d 100644
--- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesProvisioningLimits.java
+++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesProvisioningLimits.java
@@ -1,6 +1,7 @@
package org.csanchez.jenkins.plugins.kubernetes;
import com.google.common.annotations.VisibleForTesting;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.init.InitMilestone;
@@ -63,6 +64,7 @@ public static KubernetesProvisioningLimits get() {
* @param podTemplate the pod template used to schedule the agent
* @param numExecutors the number of executors (pretty much always 1)
*/
+ @SuppressFBWarnings(value="JLM_JSR166_UTILCONCURRENT_MONITORENTER", justification = "Trust me here")
public boolean register(@Nonnull KubernetesCloud cloud, @Nonnull PodTemplate podTemplate, int numExecutors) {
AtomicInteger globalCount = getGlobalCount(cloud.name);
AtomicInteger podTemplateCount = getPodTemplateCount(podTemplate.getId());
@@ -92,6 +94,7 @@ public boolean register(@Nonnull KubernetesCloud cloud, @Nonnull PodTemplate pod
* @param podTemplate the pod template used to schedule the agent
* @param numExecutors the number of executors (pretty much always 1)
*/
+ @SuppressFBWarnings(value="JLM_JSR166_UTILCONCURRENT_MONITORENTER", justification = "Trust me here")
public void unregister(@Nonnull KubernetesCloud cloud, @Nonnull PodTemplate podTemplate, int numExecutors) {
AtomicInteger globalCount = getGlobalCount(cloud.name);
AtomicInteger podTemplateCount = getPodTemplateCount(podTemplate.getId());
| 0
|
ffeb6c1f8a4c460056b582c8a766718516a2430e
|
https://github.com/openmrs/openmrs-module-reporting/commit/ffeb6c1f8a4c460056b582c8a766718516a2430e
|
[maven-release-plugin] prepare for next development iteration
|
diff --git a/api-1.10/pom.xml b/api-1.10/pom.xml
index 775a7d14a..ee86227b3 100644
--- a/api-1.10/pom.xml
+++ b/api-1.10/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api-1.10</artifactId>
diff --git a/api-1.9/pom.xml b/api-1.9/pom.xml
index 7edc5ed75..19441f3bf 100644
--- a/api-1.9/pom.xml
+++ b/api-1.9/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api-1.9</artifactId>
diff --git a/api-2.0/pom.xml b/api-2.0/pom.xml
index 0bbb4f08a..2b417bd87 100644
--- a/api-2.0/pom.xml
+++ b/api-2.0/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api-2.0</artifactId>
diff --git a/api-2.2/pom.xml b/api-2.2/pom.xml
index 2ecfc9a14..1432b3884 100644
--- a/api-2.2/pom.xml
+++ b/api-2.2/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api-2.2</artifactId>
diff --git a/api-tests/pom.xml b/api-tests/pom.xml
index 05afd67ba..1d3854c6f 100644
--- a/api-tests/pom.xml
+++ b/api-tests/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api-tests</artifactId>
diff --git a/api/pom.xml b/api/pom.xml
index d455ce76e..ebb92cb32 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-api</artifactId>
<packaging>jar</packaging>
diff --git a/omod/pom.xml b/omod/pom.xml
index 4b8b98c76..672904c76 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-omod</artifactId>
<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 4f3ae3f45..f9b19cf39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.openmrs.module</groupId>
<artifactId>reporting</artifactId>
- <version>1.20.0</version>
+ <version>1.21.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Reporting</name>
<description>Parent project for Reporting</description>
@@ -14,7 +14,7 @@
<connection>scm:git:[email protected]:openmrs/openmrs-module-reporting.git</connection>
<developerConnection>scm:git:[email protected]:openmrs/openmrs-module-reporting.git</developerConnection>
<url>https://github.com/openmrs/openmrs-module-reporting/</url>
- <tag>1.20.0</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
| 0
|
246a70bdbfac3bd45ff71c7941deef1bb206b19a
|
https://github.com/WordPress/WordPress/commit/246a70bdbfac3bd45ff71c7941deef1bb206b19a
|
Media: Improve verification of MIME file types.
Built from https://develop.svn.wordpress.org/branches/5.0@43988
git-svn-id: http://core.svn.wordpress.org/branches/5.0@43820 1a063a9b-81f0-0310-95a4-ce76da25c4cd
|
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index c44685e604ea..d4af13f2a861 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2349,17 +2349,52 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
$real_mime = finfo_file( $finfo, $file );
finfo_close( $finfo );
+ // fileinfo often misidentifies obscure files as one of these types
+ $nonspecific_types = array(
+ 'application/octet-stream',
+ 'application/encrypted',
+ 'application/CDFV2-encrypted',
+ 'application/zip',
+ );
+
/*
- * If $real_mime doesn't match what we're expecting, we need to do some extra
- * vetting of application mime types to make sure this type of file is allowed.
- * Other mime types are assumed to be safe, but should be considered unverified.
+ * If $real_mime doesn't match the content type we're expecting from the file's extension,
+ * we need to do some additional vetting. Media types and those listed in $nonspecific_types are
+ * allowed some leeway, but anything else must exactly match the real content type.
*/
- if ( $real_mime && ( $real_mime !== $type ) && ( 0 === strpos( $real_mime, 'application' ) ) ) {
- $allowed = get_allowed_mime_types();
+ if ( in_array( $real_mime, $nonspecific_types, true ) ) {
+ // File is a non-specific binary type. That's ok if it's a type that generally tends to be binary.
+ if ( !in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ) ) ) {
+ $type = $ext = false;
+ }
+ } elseif ( 0 === strpos( $real_mime, 'video/' ) || 0 === strpos( $real_mime, 'audio/' ) ) {
+ /*
+ * For these types, only the major type must match the real value.
+ * This means that common mismatches are forgiven: application/vnd.apple.numbers is often misidentified as application/zip,
+ * and some media files are commonly named with the wrong extension (.mov instead of .mp4)
+ */
- if ( ! in_array( $real_mime, $allowed ) ) {
+ if ( substr( $real_mime, 0, strcspn( $real_mime, '/' ) ) !== substr( $type, 0, strcspn( $type, '/' ) ) ) {
+ $type = $ext = false;
+ }
+ } else {
+ if ( $type !== $real_mime ) {
+ /*
+ * Everything else including image/* and application/*:
+ * If the real content type doesn't match the file extension, assume it's dangerous.
+ */
$type = $ext = false;
}
+
+ }
+ }
+
+ // The mime type must be allowed
+ if ( $type ) {
+ $allowed = get_allowed_mime_types();
+
+ if ( ! in_array( $type, $allowed ) ) {
+ $type = $ext = false;
}
}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d85ed1366724..68c92773815d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '5.0.1-alpha-43972';
+$wp_version = '5.0.1-alpha-43988';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
| 1
|
a14fdb9746262549bbbb96abb87338bacd147e1b?w=1
|
https://github.com/php/php-src/commit/a14fdb9746262549bbbb96abb87338bacd147e1b?w=1
|
Fix for bug #72790 and bug #72799
|
diff --git a/ext/wddx/tests/bug72790.phpt b/ext/wddx/tests/bug72790.phpt
new file mode 100644
index 0000000000000..a60524bdaf19e
--- /dev/null
+++ b/ext/wddx/tests/bug72790.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Bug 72790: wddx_deserialize null dereference with invalid xml
+--SKIPIF--
+<?php
+if (!extension_loaded('wddx')) {
+ die('skip. wddx not available');
+}
+?>
+--FILE--
+<?php
+
+$xml = <<< XML
+<?xml version='1.0' ?>
+<!DOCTYPE wddxPacket SYSTEM 'wddx_0100.dtd'>
+<wddxPacket version='1.0'>
+ |array>
+ <var name="XXXX">
+ <boolean value="this">
+ </boolean>
+ </var>
+ <var name="YYYY">
+ <var name="UUUU">
+ <var name="EZEZ">
+ </var>
+ </var>
+ </var>
+ </array>
+</wddxPacket>
+XML;
+
+$array = wddx_deserialize($xml);
+var_dump($array);
+?>
+--EXPECT--
+NULL
\ No newline at end of file
diff --git a/ext/wddx/tests/bug72799.phpt b/ext/wddx/tests/bug72799.phpt
new file mode 100644
index 0000000000000..5861d5538f49f
--- /dev/null
+++ b/ext/wddx/tests/bug72799.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #72799: wddx_deserialize null dereference in php_wddx_pop_element
+--SKIPIF--
+<?php
+if (!extension_loaded('wddx')) {
+ die('skip. wddx not available');
+}
+?>
+--FILE--
+<?php
+
+$xml = <<<XML
+<?xml version='1.0'?>
+<!DOCTYPE wddxPacket SYSTEM 'wddx_0100.dtd'>
+<wddxPacket version="1.0">
+ <var name="XXXX">
+ <boolean value="1">
+ <dateTime>1998-06-12T04:32:12+00</dateTime>
+ </boolean>
+ </var>
+</wddxPacket>
+XML;
+
+$array = wddx_deserialize($xml);
+var_dump($array);
+?>
+--EXPECT--
+NULL
\ No newline at end of file
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 1b2d103af18e3..d7bd295832c70 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -946,10 +946,10 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
if (!ent1->data) {
if (stack->top > 1) {
stack->top--;
+ efree(ent1);
} else {
stack->done = 1;
}
- efree(ent1);
return;
}
@@ -988,7 +988,7 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name)
wddx_stack_top(stack, (void**)&ent2);
/* if non-existent field */
- if (ent2->type == ST_FIELD && ent2->data == NULL) {
+ if (ent2->data == NULL) {
zval_ptr_dtor(&ent1->data);
efree(ent1);
return;
@@ -1179,9 +1179,13 @@ int php_wddx_deserialize_ex(char *value, int vallen, zval *return_value)
if (stack.top == 1) {
wddx_stack_top(&stack, (void**)&ent);
- *return_value = *(ent->data);
- zval_copy_ctor(return_value);
- retval = SUCCESS;
+ if(ent->data == NULL) {
+ retval = FAILURE;
+ } else {
+ *return_value = *(ent->data);
+ zval_copy_ctor(return_value);
+ retval = SUCCESS;
+ }
} else {
retval = FAILURE;
}
| 1
|
07737475986b62bc0ac8681f972a3c4ff771cef6
|
https://github.com/evanphx/json-patch/commit/07737475986b62bc0ac8681f972a3c4ff771cef6
|
Make it into a real go module and fix CI
|
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 0e5e8e8..061ddb8 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -21,8 +21,5 @@ jobs:
- name: Setup
run: go get
- - name: Build
- run: go build -v ./...
-
- name: Test
run: go test -v ./...
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..702e999
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,8 @@
+module github.com/evanphx/json-patch
+
+go 1.14
+
+require (
+ github.com/jessevdk/go-flags v1.4.0
+ github.com/pkg/errors v0.9.1
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..7fd13ef
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,4 @@
+github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
| 0
|
c6ca0b87f0cac3251d31edeb5882a09e9da77225
|
https://github.com/crowbar/barclamp-trove/commit/c6ca0b87f0cac3251d31edeb5882a09e9da77225
|
Switched to closure js compiler
|
diff --git a/Gemfile b/Gemfile
index 08a025f..e17c535 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@
source 'https://rubygems.org'
group :development do
- gem 'uglifier', '~> 2.2.1'
+ gem 'closure-compiler', '~> 1.1.10'
gem 'sass', '~> 3.2.19'
gem 'sprockets-standalone', '~> 1.2.1'
gem 'sprockets', '~> 2.11.0'
diff --git a/Rakefile b/Rakefile
index 9075694..0b57d82 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,7 +31,7 @@ begin
task.compress = true
task.digest = false
- sprockets.js_compressor = :uglifier
+ sprockets.js_compressor = :closure
sprockets.css_compressor = :sass
end
rescue
| 0
|
572e4fb96618ff19e5ef690531d04f71fc28b49b
|
https://github.com/tridentli/pitchfork/commit/572e4fb96618ff19e5ef690531d04f71fc28b49b
|
Replace fakebutton with real post form for pager.
|
diff --git a/share/templates/inc/pager.tmpl b/share/templates/inc/pager.tmpl
index fe5d380..b331aa9 100644
--- a/share/templates/inc/pager.tmpl
+++ b/share/templates/inc/pager.tmpl
@@ -1,6 +1,35 @@
<p>
- {{ if pager_less_ok .PagerOffset }}<a class="fakebutton" href="?offset={{ pager_less .PagerOffset }}{{ if .Search }}&search={{ .Search }}{{end}}">Back</a>{{ end }}
- {{ if pager_more_ok .PagerOffset .PagerTotal }}<a class="fakebutton" href="?offset={{ pager_more .PagerOffset .PagerTotal }}{{ if .Search }}&search={{ .Search }}{{end}}">Forward</a>{{ end }}
+ {{ if pager_less_ok .PagerOffset }}
+ {{ csrf_form $.UI "" }}
+ <fieldset>
+ <ul>
+ <li>
+ {{ if .Search }}
+ <input type="hidden" name="search" value="{{ .Search }}" />
+ {{ end }}
+ <input type="hidden" name="offset" value="{{ pager_less .PagerOffset }}" />
+ <input id="button" type="submit" name="button" value="Back" />
+ </li>
+ </ul>
+ </fieldset>
+ </form>
+
+ {{ end }}
+ {{ if pager_more_ok .PagerOffset .PagerTotal }}
+ {{ csrf_form $.UI "" }}
+ <fieldset>
+ <ul>
+ <li>
+ {{ if .Search }}
+ <input type="hidden" name="search" value="{{ .Search }}" />
+ {{ end }}
+ <input type="hidden" name="offset" value="{{ pager_more .PagerOffset .PagerTotal }}" />
+ <input id="button" type="submit" name="button" value="Forward" />
+ </li>
+ </ul>
+ </fieldset>
+ </form>
+ {{ end }}
</p>
<p>
Offset: {{ .PagerOffset }}, Total: {{ .PagerTotal }}
| 0
|
334248edf5eb6625db6f149de128deaabdc88efe
|
https://github.com/hawtio/hawtio/commit/334248edf5eb6625db6f149de128deaabdc88efe
|
chore(examples): #2632 add springboot-authentication-jar example
|
diff --git a/CHANGES.md b/CHANGES.md
index 0303e6e398..d3bb64e693 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
#### 2.11.0 (To be released)
* Upgrade to Spring Boot 2.3.0 / Spring Framework 5.2.6
+* Add [springboot-authentication-jar](examples/springboot-authentication-jar) example to demonstrate how to customise `hawtconfig.json` with Spring Boot jar app.
#### 2.10.0
diff --git a/examples/springboot-authentication-jar/README.md b/examples/springboot-authentication-jar/README.md
new file mode 100644
index 0000000000..82c6df15bc
--- /dev/null
+++ b/examples/springboot-authentication-jar/README.md
@@ -0,0 +1,62 @@
+# Hawtio Spring Boot 2 Authentication Example (jar)
+
+A JAR version of [sample application for Hawtio + Spring Boot 2 with authentication enabled](../springboot-authentication).
+
+This example demonstrates how you can customise `hawtconfig.json` with Spring Boot jar application instead of war.
+
+## How to run
+
+Run with
+
+ mvn spring-boot:run
+
+Browse Hawtio using the url: http://localhost:10001/actuator/hawtio/index.html
+
+Log in with user: `hawtio` password: `hawtio`
+
+## `hawtconfig.json` customisation in Spring Boot jar
+
+The most important difference is that you need to put static web resources under `src/main/resources/hawtio-static` instead of `src/main/webapp`. You cannot use `src/main/webapp` for Spring Boot jar application.
+
+The classpath `classpath:/hawtio-static/*` is a special classpath for Hawtio Spring Boot support, which is similar to `classpath:static/*` in Spring Boot but exposes static resources under the Hawtio context (default to `/actuator/hawtio/`).
+
+A custom plugin js needs to be put under `hawtio-static/app/`. It is then accessible at http://localhost:10001/actuator/hawtio/plugins/**/*.js (note `app/` is replaced with `plugins/` in the real path). Also CSS and images need to be put under `hawtio-static/css/` and `hawtio-static/img/` respectively. It is necessary because Hawtio redirects requests to paths other than `css/`, `img/`, `fonts/`, and `plugins/` to `index.html`.
+
+See [src/main/resources/hawtconfig.json](src/main/resources/hawtconfig.json).
+
+```json
+{
+ "branding": {
+ "appName": "Hawtio Spring Boot 2 Authentication Example",
+ "appLogoUrl": "img/hawtio-logo.svg",
+ "companyLogoUrl": "img/hawtio-logo.svg",
+ "css": "css/app.css",
+ "favicon": "img/favicon.ico"
+ },
+ "login": {
+ "description": "This is placeholder text only. Use this area to place any information or introductory message about your application that may be relevant to users.",
+ "links": [
+ {
+ "url": "#terms",
+ "text": "Terms of use"
+ },
+ {
+ "url": "#help",
+ "text": "Help"
+ },
+ {
+ "url": "#privacy",
+ "text": "Privacy policy"
+ }
+ ]
+ },
+ "about": {
+ "title": "Hawtio Spring Boot 2 Authentication Example",
+ "productInfo": [],
+ "additionalInfo": "",
+ "copyright": "(c) 2019 Hawtio team",
+ "imgSrc": "img/hawtio-logo.svg"
+ },
+ "disabledRoutes": []
+}
+```
diff --git a/examples/springboot-authentication-jar/pom.xml b/examples/springboot-authentication-jar/pom.xml
new file mode 100644
index 0000000000..eb3b7e02f7
--- /dev/null
+++ b/examples/springboot-authentication-jar/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>io.hawt</groupId>
+ <artifactId>project</artifactId>
+ <version>2.11-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+ <groupId>io.hawt.examples</groupId>
+ <artifactId>hawtio-example-springboot-authentication-jar</artifactId>
+ <name>${project.artifactId}</name>
+ <description>hawtio :: Sample Spring Boot 2.x process with authentication (jar)</description>
+ <packaging>jar</packaging>
+
+ <properties>
+ <!-- Jetty version referred from the spring-boot-dependencies project -->
+ <jetty.version>9.4.11.v20180605</jetty.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.hawt</groupId>
+ <artifactId>hawtio-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-undertow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jaas</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.hawt</groupId>
+ <artifactId>hawtio-springboot</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot-version}</version>
+ <configuration>
+ <mainClass>io.hawt.example.spring.boot.SampleAuthenticationSpringBootService</mainClass>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/HelloController.java b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/HelloController.java
new file mode 100644
index 0000000000..3c6b7a8c15
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/HelloController.java
@@ -0,0 +1,16 @@
+package io.hawt.example.spring.boot;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class HelloController {
+
+ @RequestMapping("/")
+ @ResponseBody
+ public String hello() {
+ return "Hello World!";
+ }
+
+}
diff --git a/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/PropertyFileLoginModule.java b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/PropertyFileLoginModule.java
new file mode 100644
index 0000000000..5fcb1ee8eb
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/PropertyFileLoginModule.java
@@ -0,0 +1,108 @@
+package io.hawt.example.spring.boot;
+
+import org.eclipse.jetty.jaas.spi.AbstractLoginModule;
+import org.eclipse.jetty.jaas.spi.UserInfo;
+import org.eclipse.jetty.security.PropertyUserStore;
+import org.eclipse.jetty.server.UserIdentity;
+import org.eclipse.jetty.util.security.Credential;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Sample PropertyFileLoginModule.
+ */
+public class PropertyFileLoginModule extends AbstractLoginModule {
+ public static final String DEFAULT_FILENAME = "realm.properties";
+
+ private static final Logger LOG = LoggerFactory.getLogger(PropertyFileLoginModule.class);
+ private static ConcurrentHashMap<String, PropertyUserStore> PROPERTY_USERSTORES = new ConcurrentHashMap<>();
+
+ private boolean hotReload = false;
+ private String filename = null;
+
+ /**
+ * Read contents of the configured property file.
+ *
+ * @param subject
+ * @param callbackHandler
+ * @param sharedState
+ * @param options
+ * @see javax.security.auth.spi.LoginModule#initialize(Subject, CallbackHandler, Map, Map)
+ */
+ @Override
+ public void initialize(final Subject subject, final CallbackHandler callbackHandler,
+ final Map<String, ?> sharedState, final Map<String, ?> options) {
+ super.initialize(subject, callbackHandler, sharedState, options);
+ setupPropertyUserStore(options);
+ }
+
+ private void setupPropertyUserStore(final Map<String, ?> options) {
+ parseConfig(options);
+
+ if (PROPERTY_USERSTORES.get(filename) == null) {
+ final PropertyUserStore propertyUserStore = new PropertyUserStore();
+ propertyUserStore.setConfig(filename);
+ propertyUserStore.setHotReload(hotReload);
+
+ final PropertyUserStore prev = PROPERTY_USERSTORES.putIfAbsent(filename, propertyUserStore);
+ if (prev == null) {
+ LOG.info("setupPropertyUserStore: Starting new PropertyUserStore. PropertiesFile: " + filename
+ + " hotReload: " + hotReload);
+
+ try {
+ propertyUserStore.start();
+ } catch (Exception e) {
+ LOG.warn("Exception while starting propertyUserStore: ", e);
+ }
+ }
+ }
+ }
+
+ private void parseConfig(final Map<String, ?> options) {
+ String tmp = (String) options.get("file");
+ filename = (tmp == null ? DEFAULT_FILENAME : tmp);
+ filename = System.getProperty("login.file", filename);
+ tmp = (String) options.get("hotReload");
+ hotReload = tmp == null ? hotReload : Boolean.parseBoolean(tmp);
+ }
+
+ @Override
+ public UserInfo getUserInfo(final String userName) {
+ final PropertyUserStore propertyUserStore = PROPERTY_USERSTORES.get(filename);
+ if (propertyUserStore == null) {
+ throw new IllegalStateException("PropertyUserStore should never be null here!");
+ }
+
+ LOG.trace("Checking PropertyUserStore " + filename + " for " + userName);
+ final UserIdentity userIdentity = propertyUserStore.getUserIdentity(userName);
+ if (userIdentity == null) {
+ return null;
+ }
+
+ final Set<Principal> principals = userIdentity.getSubject().getPrincipals();
+ final List<String> roles = new ArrayList<>();
+ for (final Principal principal : principals) {
+ roles.add(principal.getName());
+ }
+
+ final Credential credential = (Credential) userIdentity.getSubject().getPrivateCredentials().iterator().next();
+ LOG.trace("Found: " + userName + " in PropertyUserStore " + filename);
+ return new UserInfo(userName, credential, roles);
+ }
+
+ @Override
+ public boolean logout() throws LoginException {
+ return true;
+ }
+}
diff --git a/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/SampleAuthenticationSpringBootService.java b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/SampleAuthenticationSpringBootService.java
new file mode 100644
index 0000000000..82446d3850
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/java/io/hawt/example/spring/boot/SampleAuthenticationSpringBootService.java
@@ -0,0 +1,73 @@
+package io.hawt.example.spring.boot;
+
+import java.net.URL;
+
+import io.hawt.config.ConfigFacade;
+import io.hawt.springboot.HawtioPlugin;
+import io.hawt.web.auth.AuthenticationConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+@SpringBootApplication
+public class SampleAuthenticationSpringBootService {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SampleAuthenticationSpringBootService.class);
+ private static final String JAVA_SECURITY_AUTH_LOGIN_CONFIG = "java.security.auth.login.config";
+
+ public static void main(String[] args) {
+ System.setProperty(AuthenticationConfiguration.HAWTIO_AUTHENTICATION_ENABLED, "false");
+ SpringApplication.run(SampleAuthenticationSpringBootService.class, args);
+ }
+
+ /**
+ * Loading an example plugin.
+ */
+ @Bean
+ public HawtioPlugin samplePlugin() {
+ return new HawtioPlugin("sample-plugin",
+ "plugins",
+ "",
+ new String[] { "sample-plugin/sample-plugin.js" });
+ }
+
+ /**
+ * Configure facade to use authentication.
+ *
+ * @return config
+ * @throws Exception if an error occurs
+ */
+ @Bean(initMethod = "init")
+ public ConfigFacade configFacade() throws Exception {
+
+ final URL loginResource = this.getClass().getClassLoader().getResource("login.conf");
+ if (loginResource != null) {
+ setSystemPropertyIfNotSet(JAVA_SECURITY_AUTH_LOGIN_CONFIG, loginResource.toExternalForm());
+ }
+ LOG.info("Using loginResource " + JAVA_SECURITY_AUTH_LOGIN_CONFIG + " : " + System
+ .getProperty(JAVA_SECURITY_AUTH_LOGIN_CONFIG));
+
+ final URL loginFile = this.getClass().getClassLoader().getResource("realm.properties");
+ if (loginFile != null) {
+ setSystemPropertyIfNotSet("login.file", loginFile.toExternalForm());
+ }
+ LOG.info("Using login.file : " + System.getProperty("login.file"));
+
+ setSystemPropertyIfNotSet(AuthenticationConfiguration.HAWTIO_ROLES, "admin");
+ setSystemPropertyIfNotSet(AuthenticationConfiguration.HAWTIO_REALM, "hawtio");
+ setSystemPropertyIfNotSet(AuthenticationConfiguration.HAWTIO_ROLE_PRINCIPAL_CLASSES, "org.eclipse.jetty.jaas.JAASRole");
+ if (!Boolean.getBoolean("debugMode")) {
+ System.setProperty(AuthenticationConfiguration.HAWTIO_AUTHENTICATION_ENABLED, "true");
+ }
+ return new ConfigFacade();
+ }
+
+ private void setSystemPropertyIfNotSet(final String key, final String value) {
+ if (System.getProperty(key) == null) {
+ System.setProperty(key, value);
+ }
+ }
+
+}
diff --git a/examples/springboot-authentication-jar/src/main/resources/application.properties b/examples/springboot-authentication-jar/src/main/resources/application.properties
new file mode 100644
index 0000000000..308bc126b7
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/application.properties
@@ -0,0 +1,11 @@
+server.port=10000
+management.server.port=10001
+
+management.endpoints.web.exposure.include=hawtio,jolokia
+
+spring.jmx.enabled=true
+
+logging.level.io.hawt=INFO
+logging.level.org.springframework=WARN
+logging.level.io.undertow=WARN
+logging.level.org.eclipse.jetty=WARN
diff --git a/examples/springboot-authentication-jar/src/main/resources/banner.txt b/examples/springboot-authentication-jar/src/main/resources/banner.txt
new file mode 100644
index 0000000000..e832f57a86
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/banner.txt
@@ -0,0 +1,9 @@
+ _______________________________
+/ Hawtio SpringBoot Sample With \
+\ Authentication /
+ -------------------------------
+ \ ^__^
+ \ (oo)\_______
+ (__)\ )\/\
+ ||----w |
+ || ||
diff --git a/examples/springboot-authentication-jar/src/main/resources/hawtio-static/app/sample-plugin/sample-plugin.js b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/app/sample-plugin/sample-plugin.js
new file mode 100644
index 0000000000..cb8c8252c1
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/app/sample-plugin/sample-plugin.js
@@ -0,0 +1,66 @@
+var SamplePlugin = (function (SamplePlugin) {
+
+ SamplePlugin.pluginName = 'sample-plugin';
+ SamplePlugin.log = Logger.get('sample-plugin');
+
+ SamplePlugin.module = angular.module(SamplePlugin.pluginName, [])
+ .config(configureRoutes)
+ .run(configureHelp)
+ .run(configureLayout)
+ .run(initPlugin)
+ .component('samplePlugin', {
+ template: `
+ <div class="sample-controller">
+ <div class="row-fluid">
+ <div class="span6 offset3">
+ <h2>Sample Plugin</h2>
+ <p>{{$ctrl.message}}</p>
+ </div>
+ </div>
+ </div>`,
+ controller: SamplePluginController
+ });
+
+ function configureRoutes($routeProvider) {
+ $routeProvider
+ .when('/sample-plugin', { template: '<sample-plugin></sample-plugin>' })
+ }
+ configureRoutes.$inject = ['$routeProvider'];
+
+ function configureHelp(helpRegistry, $templateCache) {
+ var path = 'plugin/help.md';
+ helpRegistry.addUserDoc('Sample Plugin', path);
+ $templateCache.put(path, `
+## Spring Boot Sample plugin
+
+Help documentation for Spring Boot Sample plugin.
+ `);
+ }
+ configureHelp.$inject = ['helpRegistry', '$templateCache'];
+
+ function configureLayout(mainNavService) {
+ // set rank = -10 to make sure the item is placed at the bottom
+ mainNavService.addItem({
+ title: 'Sample Plugin',
+ href: '/sample-plugin',
+ isValid: function () { return true; },
+ rank: -10
+ });
+ }
+ configureLayout.$inject = ['mainNavService'];
+
+ function initPlugin() {
+ SamplePlugin.log.info(SamplePlugin.pluginName, "loaded");
+ }
+ initPlugin.$inject = [];
+
+ function SamplePluginController($scope, jolokia) {
+ this.message = "Hello world!";
+ }
+ SamplePluginController.$inject = ['$scope', 'jolokia'];
+
+ return SamplePlugin;
+
+})(SamplePlugin || {});
+
+hawtioPluginLoader.addModule(SamplePlugin.pluginName);
diff --git a/examples/springboot-authentication-jar/src/main/resources/hawtio-static/css/app.css b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/css/app.css
new file mode 100644
index 0000000000..f807257204
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/css/app.css
@@ -0,0 +1,7 @@
+/* You can customise the styles of your application here. */
+
+/* Change the background image for Login page and About modal */
+.pf-c-login, .pf-c-about-modal-box__hero {
+ background-image: url("../img/background.svg");
+ background-size: cover;
+}
diff --git a/examples/springboot-authentication-jar/src/main/resources/hawtio-static/hawtconfig.json b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/hawtconfig.json
new file mode 100644
index 0000000000..6a6e5936d4
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/hawtconfig.json
@@ -0,0 +1,34 @@
+{
+ "branding": {
+ "appName": "Hawtio Spring Boot 2 Authentication Example",
+ "appLogoUrl": "img/hawtio-logo.svg",
+ "companyLogoUrl": "img/hawtio-logo.svg",
+ "css": "css/app.css",
+ "favicon": "img/favicon.ico"
+ },
+ "login": {
+ "description": "This is placeholder text only. Use this area to place any information or introductory message about your application that may be relevant to users.",
+ "links": [
+ {
+ "url": "#terms",
+ "text": "Terms of use"
+ },
+ {
+ "url": "#help",
+ "text": "Help"
+ },
+ {
+ "url": "#privacy",
+ "text": "Privacy policy"
+ }
+ ]
+ },
+ "about": {
+ "title": "Hawtio Spring Boot 2 Authentication Example",
+ "productInfo": [],
+ "additionalInfo": "",
+ "copyright": "(c) 2019 Hawtio team",
+ "imgSrc": "img/hawtio-logo.svg"
+ },
+ "disabledRoutes": []
+}
diff --git a/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/background.svg b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/background.svg
new file mode 100644
index 0000000000..8ab25c9229
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/background.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1500px" height="850px" viewBox="0 0 1500 850" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+ <title>BG</title>
+ <desc>Created with Sketch.</desc>
+ <g id="Background-Downstream" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="Login-Regular---Full-Feature">
+ <g id="BG">
+ <rect id="Rectangle" fill="#1A1A1A" x="0" y="0" width="1500" height="850"></rect>
+ <g id="Red-Hat-Hat-RGB-grey" transform="translate(235.000000, 13.000000)" fill="#090A0A" fill-rule="nonzero">
+ <path d="M774.813452,506.645833 C851.074619,506.645833 961.500788,490.775 961.500788,399.822917 C961.500788,393.108333 960.890699,385.783333 959.67052,379.06875 L914.52391,181.29375 C904.152391,137.954167 895.001051,117.810417 818.739884,79.9645833 C759.561219,49.44375 630.83237,0 592.396742,0 C556.401471,-1.08431782e-14 546.029953,45.78125 503.933789,45.78125 C463.057803,45.78125 433.163426,11.5979167 394.727798,11.5979167 C358.122438,11.5979167 334.328954,36.625 316.026274,87.9 C316.026274,87.9 264.77877,232.56875 258.067788,253.933333 C256.847609,257.595833 256.847609,261.86875 256.847609,265.53125 C256.23752,321.689583 477.699947,506.035417 774.813452,506.645833 M973.092486,437.058333 C983.464004,487.1125 983.464004,492.60625 983.464004,498.710417 C983.464004,584.16875 887.679979,631.78125 761.391487,631.78125 C475.869679,631.78125 226.343142,464.527083 226.343142,354.041667 C226.343142,338.78125 229.393589,323.520833 235.494482,309.48125 C132.999475,314.364583 0,332.677083 0,449.877083 C0,642.158333 455.126642,879 815.079348,879 C1091.44982,879 1161,753.864583 1161,654.977083 C1161,577.454167 1093.89017,489.554167 973.092486,437.058333" id="Shape"></path>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/favicon.ico b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/favicon.ico
new file mode 100644
index 0000000000..11c5cd2619
Binary files /dev/null and b/examples/springboot-authentication-jar/src/main/resources/hawtio-static/img/favicon.ico differ
diff --git a/examples/springboot-authentication-jar/src/main/resources/jolokia-access.xml b/examples/springboot-authentication-jar/src/main/resources/jolokia-access.xml
new file mode 100644
index 0000000000..d714f347ea
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/jolokia-access.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2009-2011 Roland Huss
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<restrict>
+
+ <!-- List of remote hosts which are allowed to access this agent. The name can be
+ given as IP or FQDN. If any of the given hosts matches, access will be allowed
+ (respecting further restrictions, though). If <remote> ... </remote> is given
+ without any host no access is allowed at all (probably not what you want).
+
+ You can also specify a subnetmask behind a numeric IP adress in which case any
+ host within the specified subnet is allowed to access the agent. The netmask can
+ be given either in CIDR format (e.g "/16") or as a full netmask (e.g. "/255.255.0.0")
+ -->
+ <!--
+ <remote>
+ <host>127.0.0.1</host>
+ <host>localhost</host>
+ <host>10.0.0.0/16</host>
+ </remote>
+ -->
+
+ <!--
+ Access restriction based on the HTTP method with which an Jolokia request was received.
+ The following example allows only HTTP POST requests. If the section is missing, all
+ HTTP requests methods are allowed.
+ -->
+ <!--
+ <http>
+ <method>post</method>
+ </http>
+ -->
+
+ <!--
+ List of allowed commands.
+
+ If this sections is present, it influence the following section.
+
+ For each command type present, the principle behaviour is allow this command for all
+ MBeans. To remove an MBean (attribute/operation), a <deny> section has to be added.
+
+ For each command type missing, the command is disabled by default. For certain MBeans
+ it can be selectively by enabled by using an <allow> section below
+
+ Known types are:
+
+ * read
+ * write
+ * exec
+ * list
+ * version
+ * search
+
+ A missing <commands> section implies that every operation type is allowed (and can
+ be selectively controlled by a <deny> section)
+ -->
+
+ <commands>
+ <command>read</command>
+ <command>write</command>
+ <command>exec</command>
+ <command>list</command>
+ <command>version</command>
+ <command>search</command>
+ </commands>
+
+ <!-- For each command type missing in a given <commands> section, for certain MBeans (which
+ be a pattern, too) an command be alloed. Note that an <allow> entry e.g. for reading
+ an attribute of an certain MBean has no influence if reading is enabled globally anyway -->
+<!--
+ <allow>
+ <mbean>
+ <name>jolokia:type=Config</name>
+ <operation>*</operation>
+ <attribute>*</attribute>
+ </mbean>
+ <mbean>
+ <name>java.lang:type=Threading</name>
+ <operation>findDeadlockedThreads</operation>
+ </mbean>
+ </allow>
+-->
+
+ <!-- MBean access can be restricted by a <deny> section for commands enabled in a <commands> section
+ (or when the <commands> section is missing completely in which case all commands are allowed)
+ -->
+ <deny>
+ <mbean>
+ <!-- Exposes user/password of data source, so we forbid this one -->
+ <name>com.mchange.v2.c3p0:type=PooledDataSource,*</name>
+ <attribute>properties</attribute>
+ </mbean>
+ </deny>
+
+
+ <cors>
+ <!-- Allow cross origin access -->
+ <allow-origin>*</allow-origin>
+ </cors>
+</restrict>
diff --git a/examples/springboot-authentication-jar/src/main/resources/login.conf b/examples/springboot-authentication-jar/src/main/resources/login.conf
new file mode 100644
index 0000000000..6c4cfc1676
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/login.conf
@@ -0,0 +1,3 @@
+hawtio {
+ io.hawt.example.spring.boot.PropertyFileLoginModule required;
+};
diff --git a/examples/springboot-authentication-jar/src/main/resources/realm.properties b/examples/springboot-authentication-jar/src/main/resources/realm.properties
new file mode 100644
index 0000000000..77055d3748
--- /dev/null
+++ b/examples/springboot-authentication-jar/src/main/resources/realm.properties
@@ -0,0 +1,7 @@
+#
+# Hash generated with:
+# java -cp ~/.m2/repository/org/eclipse/jetty/jetty-util/9.2.11.v20150529/jetty-util-9.2.11.v20150529.jar org.eclipse.jetty.util.security.Password hawtio hawtio
+#
+
+hawtio: MD5:2d3c8a35f1d0c2a1a6ff1dc4ba221476,user,admin
+
diff --git a/pom.xml b/pom.xml
index a62a0ed4e8..6a4059d9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
<module>examples/branding-plugin</module>
<module>examples/simple-plugin</module>
<module>examples/springboot-authentication</module>
+ <module>examples/springboot-authentication-jar</module>
<module>examples/springboot-keycloak</module>
<module>examples/springboot-security</module>
<module>examples/springboot</module>
| 0
|
0c2134a645df34e05cd69bc084506c58694eb697
|
https://github.com/wesnoth/wesnoth/commit/0c2134a645df34e05cd69bc084506c58694eb697
|
Further boost cleanup
* Removed more unnecessary includes
* Used std::swap instead of boost::swap in fake_unit_ptr. This is since unit_ptr (the type of `unit_` here)
is now just a shared_ptr instead of a boost::intrusive_ptr.
* Used std::gcd instead of boost::integer::gcd
|
diff --git a/src/chat_events.cpp b/src/chat_events.cpp
index e92de7fc4e14..dc4becfb01dd 100644
--- a/src/chat_events.cpp
+++ b/src/chat_events.cpp
@@ -22,8 +22,6 @@
#include "preferences/general.hpp"
#include "preferences/game.hpp"
-#include <boost/range/algorithm/find_if.hpp>
-
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/src/config_attribute_value.hpp b/src/config_attribute_value.hpp
index ee012b3ed822..98aeeb473442 100644
--- a/src/config_attribute_value.hpp
+++ b/src/config_attribute_value.hpp
@@ -41,9 +41,6 @@
#include <type_traits>
#include <memory>
-#include <boost/exception/exception.hpp>
-#include <boost/range/iterator_range.hpp>
-
class enum_tag;
/**
diff --git a/src/fake_unit_ptr.cpp b/src/fake_unit_ptr.cpp
index 401fc9043c84..4d321ae6913e 100644
--- a/src/fake_unit_ptr.cpp
+++ b/src/fake_unit_ptr.cpp
@@ -19,8 +19,6 @@
#include "units/unit.hpp"
#include "units/ptr.hpp"
-#include <boost/swap.hpp>
-
fake_unit_ptr::fake_unit_ptr() : unit_(), my_manager_(nullptr) {}
fake_unit_ptr::fake_unit_ptr(const internal_ptr & u) : unit_(u), my_manager_(nullptr) {}
fake_unit_ptr::fake_unit_ptr(const internal_ptr & u, fake_unit_manager * mgr) : unit_(u), my_manager_(nullptr)
@@ -40,7 +38,7 @@ fake_unit_ptr::fake_unit_ptr(fake_unit_ptr && ptr)
}
void fake_unit_ptr::swap (fake_unit_ptr & o) {
- boost::swap(unit_, o.unit_);
+ std::swap(unit_, o.unit_);
std::swap(my_manager_, o.my_manager_);
}
diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index cc3aa2832cfe..a5cae212846d 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -57,13 +57,8 @@
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/window.hpp"
-#if BOOST_VERSION >= 106700
-#include <boost/integer/common_factor_rt.hpp>
-#else
-#include <boost/math/common_factor_rt.hpp>
-#endif
-
#include <functional>
+#include <numeric>
namespace gui2
{
@@ -142,12 +137,7 @@ void preferences_dialog::set_resolution_list(menu_button& res_list)
config option;
option["label"] = formatter() << res.x << font::unicode_multiplication_sign << res.y;
-#if BOOST_VERSION >= 106700
- const int div = boost::integer::gcd(res.x, res.y);
-#else
- const int div = boost::math::gcd(res.x, res.y);
-#endif
-
+ const int div = std::gcd(12, 4);
const int x_ratio = res.x / div;
const int y_ratio = res.y / div;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 858573fd6ac5..6b7289b1d517 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -29,12 +29,7 @@
#include "wml_exception.hpp"
#include <functional>
-
-#if BOOST_VERSION >= 106700
-#include <boost/integer/common_factor_rt.hpp>
-#else
-#include <boost/math/common_factor_rt.hpp>
-#endif
+#include <numeric>
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
@@ -265,12 +260,7 @@ void slider::set_value_range(int min_value, int max_value)
int diff = max_value - min_value;
int old_value = get_value();
-#if BOOST_VERSION >= 106700
- step_size_ = boost::integer::gcd(diff, step_size_);
-#else
- step_size_ = boost::math::gcd(diff, step_size_);
-#endif
-
+ step_size_ = std::gcd(diff, step_size_);
minimum_value_ = min_value;
slider_set_item_last(diff / step_size_);
@@ -289,11 +279,8 @@ void slider::set_step_size(int step_size)
const int range_diff = get_item_count() - 1;
const int old_value = get_value();
-#if BOOST_VERSION >= 106700
- step_size_ = boost::integer::gcd(range_diff, step_size);
-#else
- step_size_ = boost::math::gcd(range_diff, step_size);
-#endif
+ step_size_ = std::gcd(range_diff, step_size);
+
slider_set_item_last(range_diff / step_size_);
set_value(old_value);
diff --git a/src/log.cpp b/src/log.cpp
index 8a071ed87c88..1b5216ae3fda 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -21,12 +21,11 @@
#include "log.hpp"
-#include <boost/date_time.hpp>
-
#include <map>
#include <sstream>
#include <ctime>
#include <mutex>
+#include <iomanip>
namespace {
diff --git a/src/team.cpp b/src/team.cpp
index 086301990eb6..508090b743ce 100644
--- a/src/team.cpp
+++ b/src/team.cpp
@@ -35,8 +35,6 @@
#include "units/types.hpp"
#include "whiteboard/side_actions.hpp"
-#include <boost/dynamic_bitset.hpp>
-
static lg::log_domain log_engine("engine");
#define DBG_NG LOG_STREAM(debug, log_engine)
#define LOG_NG LOG_STREAM(info, log_engine)
| 0
|
2bf14dcfa335ab808231ca52b54bd2ca9f7c9944
|
https://github.com/bcgit/bc-java/commit/2bf14dcfa335ab808231ca52b54bd2ca9f7c9944
|
Merge branch 'xipki-master'
|
diff --git a/core/src/main/java/org/bouncycastle/crypto/macs/SipHash128.java b/core/src/main/java/org/bouncycastle/crypto/macs/SipHash128.java
new file mode 100644
index 000000000..ae49d037a
--- /dev/null
+++ b/core/src/main/java/org/bouncycastle/crypto/macs/SipHash128.java
@@ -0,0 +1,85 @@
+package org.bouncycastle.crypto.macs;
+
+import org.bouncycastle.crypto.DataLengthException;
+import org.bouncycastle.util.Pack;
+
+/**
+ * Implementation of SipHash with 128 bit output.
+ * <p>
+ * Based on the {@link SipHash} and the C reference implementation
+ * https://github.com/veorq/SipHash.
+ *
+ */
+public class SipHash128
+ extends SipHash
+{
+
+ /**
+ * SipHash128-2-4
+ */
+ public SipHash128()
+ {
+ super();
+ }
+
+ /**
+ * SipHash128-c-d
+ *
+ * @param c the number of compression rounds
+ * @param d the number of finalization rounds
+ */
+ public SipHash128(int c, int d)
+ {
+ super(c, d);
+ }
+
+ public String getAlgorithmName()
+ {
+ return "SipHash128-" + c + "-" + d;
+ }
+
+ public int getMacSize()
+ {
+ return 16;
+ }
+
+ public long doFinal()
+ throws DataLengthException, IllegalStateException {
+ throw new UnsupportedOperationException("doFinal() is not supported");
+ }
+
+ public int doFinal(byte[] out, int outOff)
+ throws DataLengthException, IllegalStateException
+ {
+ // NOTE: 2 distinct shifts to avoid "64-bit shift" when wordPos == 0
+ m >>>= ((7 - wordPos) << 3);
+ m >>>= 8;
+ m |= (((wordCount << 3) + wordPos) & 0xffL) << 56;
+
+ processMessageWord();
+
+ v2 ^= 0xeeL;
+
+ applySipRounds(d);
+
+ long r0 = v0 ^ v1 ^ v2 ^ v3;
+
+ v1 ^= 0xddL;
+ applySipRounds(d);
+
+ long r1 = v0 ^ v1 ^ v2 ^ v3;
+
+ reset();
+
+ Pack.longToLittleEndian(r0, out, outOff);
+ Pack.longToLittleEndian(r1, out, outOff + 8);
+ return 16;
+ }
+
+ public void reset()
+ {
+ super.reset();
+ v1 ^= 0xeeL;
+ }
+
+}
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SipHash128Test.java b/core/src/test/java/org/bouncycastle/crypto/test/SipHash128Test.java
new file mode 100644
index 000000000..1c0d21f1e
--- /dev/null
+++ b/core/src/test/java/org/bouncycastle/crypto/test/SipHash128Test.java
@@ -0,0 +1,314 @@
+package org.bouncycastle.crypto.test;
+
+import java.security.SecureRandom;
+
+import org.bouncycastle.crypto.macs.SipHash128;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.encoders.Hex;
+import org.bouncycastle.util.test.SimpleTest;
+
+/*
+ * SipHash test values are taken from the output of the C reference implementations:
+ * section "const uint8_t vectors_sip128[64][16]" of the output of command ./vectors.
+ */
+public class SipHash128Test
+ extends SimpleTest
+{
+ private static final int UPDATE_BYTES = 0;
+ private static final int UPDATE_FULL = 1;
+ private static final int UPDATE_MIX = 2;
+
+ public String getName()
+ {
+ return "SipHash128";
+ }
+
+ public void performTest()
+ throws Exception
+ {
+ performTest_2_4();
+ performTest_4_8();
+ }
+
+ private void performTest_2_4()
+ throws Exception
+ {
+ /*
+ * SipHash test values are taken from the output of the C reference implementations:
+ * section "const uint8_t vectors_sip128[64][16]" of the output of command ./vectors.
+ */
+ int[][] vectors_sip128 = new int[][] {
+ { 0xa3, 0x81, 0x7f, 0x04, 0xba, 0x25, 0xa8, 0xe6, 0x6d, 0xf6, 0x72, 0x14, 0xc7, 0x55, 0x02, 0x93, },
+ { 0xda, 0x87, 0xc1, 0xd8, 0x6b, 0x99, 0xaf, 0x44, 0x34, 0x76, 0x59, 0x11, 0x9b, 0x22, 0xfc, 0x45, },
+ { 0x81, 0x77, 0x22, 0x8d, 0xa4, 0xa4, 0x5d, 0xc7, 0xfc, 0xa3, 0x8b, 0xde, 0xf6, 0x0a, 0xff, 0xe4, },
+ { 0x9c, 0x70, 0xb6, 0x0c, 0x52, 0x67, 0xa9, 0x4e, 0x5f, 0x33, 0xb6, 0xb0, 0x29, 0x85, 0xed, 0x51, },
+ { 0xf8, 0x81, 0x64, 0xc1, 0x2d, 0x9c, 0x8f, 0xaf, 0x7d, 0x0f, 0x6e, 0x7c, 0x7b, 0xcd, 0x55, 0x79, },
+ { 0x13, 0x68, 0x87, 0x59, 0x80, 0x77, 0x6f, 0x88, 0x54, 0x52, 0x7a, 0x07, 0x69, 0x0e, 0x96, 0x27, },
+ { 0x14, 0xee, 0xca, 0x33, 0x8b, 0x20, 0x86, 0x13, 0x48, 0x5e, 0xa0, 0x30, 0x8f, 0xd7, 0xa1, 0x5e, },
+ { 0xa1, 0xf1, 0xeb, 0xbe, 0xd8, 0xdb, 0xc1, 0x53, 0xc0, 0xb8, 0x4a, 0xa6, 0x1f, 0xf0, 0x82, 0x39, },
+ { 0x3b, 0x62, 0xa9, 0xba, 0x62, 0x58, 0xf5, 0x61, 0x0f, 0x83, 0xe2, 0x64, 0xf3, 0x14, 0x97, 0xb4, },
+ { 0x26, 0x44, 0x99, 0x06, 0x0a, 0xd9, 0xba, 0xab, 0xc4, 0x7f, 0x8b, 0x02, 0xbb, 0x6d, 0x71, 0xed, },
+ { 0x00, 0x11, 0x0d, 0xc3, 0x78, 0x14, 0x69, 0x56, 0xc9, 0x54, 0x47, 0xd3, 0xf3, 0xd0, 0xfb, 0xba, },
+ { 0x01, 0x51, 0xc5, 0x68, 0x38, 0x6b, 0x66, 0x77, 0xa2, 0xb4, 0xdc, 0x6f, 0x81, 0xe5, 0xdc, 0x18, },
+ { 0xd6, 0x26, 0xb2, 0x66, 0x90, 0x5e, 0xf3, 0x58, 0x82, 0x63, 0x4d, 0xf6, 0x85, 0x32, 0xc1, 0x25, },
+ { 0x98, 0x69, 0xe2, 0x47, 0xe9, 0xc0, 0x8b, 0x10, 0xd0, 0x29, 0x93, 0x4f, 0xc4, 0xb9, 0x52, 0xf7, },
+ { 0x31, 0xfc, 0xef, 0xac, 0x66, 0xd7, 0xde, 0x9c, 0x7e, 0xc7, 0x48, 0x5f, 0xe4, 0x49, 0x49, 0x02, },
+ { 0x54, 0x93, 0xe9, 0x99, 0x33, 0xb0, 0xa8, 0x11, 0x7e, 0x08, 0xec, 0x0f, 0x97, 0xcf, 0xc3, 0xd9, },
+ { 0x6e, 0xe2, 0xa4, 0xca, 0x67, 0xb0, 0x54, 0xbb, 0xfd, 0x33, 0x15, 0xbf, 0x85, 0x23, 0x05, 0x77, },
+ { 0x47, 0x3d, 0x06, 0xe8, 0x73, 0x8d, 0xb8, 0x98, 0x54, 0xc0, 0x66, 0xc4, 0x7a, 0xe4, 0x77, 0x40, },
+ { 0xa4, 0x26, 0xe5, 0xe4, 0x23, 0xbf, 0x48, 0x85, 0x29, 0x4d, 0xa4, 0x81, 0xfe, 0xae, 0xf7, 0x23, },
+ { 0x78, 0x01, 0x77, 0x31, 0xcf, 0x65, 0xfa, 0xb0, 0x74, 0xd5, 0x20, 0x89, 0x52, 0x51, 0x2e, 0xb1, },
+ { 0x9e, 0x25, 0xfc, 0x83, 0x3f, 0x22, 0x90, 0x73, 0x3e, 0x93, 0x44, 0xa5, 0xe8, 0x38, 0x39, 0xeb, },
+ { 0x56, 0x8e, 0x49, 0x5a, 0xbe, 0x52, 0x5a, 0x21, 0x8a, 0x22, 0x14, 0xcd, 0x3e, 0x07, 0x1d, 0x12, },
+ { 0x4a, 0x29, 0xb5, 0x45, 0x52, 0xd1, 0x6b, 0x9a, 0x46, 0x9c, 0x10, 0x52, 0x8e, 0xff, 0x0a, 0xae, },
+ { 0xc9, 0xd1, 0x84, 0xdd, 0xd5, 0xa9, 0xf5, 0xe0, 0xcf, 0x8c, 0xe2, 0x9a, 0x9a, 0xbf, 0x69, 0x1c, },
+ { 0x2d, 0xb4, 0x79, 0xae, 0x78, 0xbd, 0x50, 0xd8, 0x88, 0x2a, 0x8a, 0x17, 0x8a, 0x61, 0x32, 0xad, },
+ { 0x8e, 0xce, 0x5f, 0x04, 0x2d, 0x5e, 0x44, 0x7b, 0x50, 0x51, 0xb9, 0xea, 0xcb, 0x8d, 0x8f, 0x6f, },
+ { 0x9c, 0x0b, 0x53, 0xb4, 0xb3, 0xc3, 0x07, 0xe8, 0x7e, 0xae, 0xe0, 0x86, 0x78, 0x14, 0x1f, 0x66, },
+ { 0xab, 0xf2, 0x48, 0xaf, 0x69, 0xa6, 0xea, 0xe4, 0xbf, 0xd3, 0xeb, 0x2f, 0x12, 0x9e, 0xeb, 0x94, },
+ { 0x06, 0x64, 0xda, 0x16, 0x68, 0x57, 0x4b, 0x88, 0xb9, 0x35, 0xf3, 0x02, 0x73, 0x58, 0xae, 0xf4, },
+ { 0xaa, 0x4b, 0x9d, 0xc4, 0xbf, 0x33, 0x7d, 0xe9, 0x0c, 0xd4, 0xfd, 0x3c, 0x46, 0x7c, 0x6a, 0xb7, },
+ { 0xea, 0x5c, 0x7f, 0x47, 0x1f, 0xaf, 0x6b, 0xde, 0x2b, 0x1a, 0xd7, 0xd4, 0x68, 0x6d, 0x22, 0x87, },
+ { 0x29, 0x39, 0xb0, 0x18, 0x32, 0x23, 0xfa, 0xfc, 0x17, 0x23, 0xde, 0x4f, 0x52, 0xc4, 0x3d, 0x35, },
+ { 0x7c, 0x39, 0x56, 0xca, 0x5e, 0xea, 0xfc, 0x3e, 0x36, 0x3e, 0x9d, 0x55, 0x65, 0x46, 0xeb, 0x68, },
+ { 0x77, 0xc6, 0x07, 0x71, 0x46, 0xf0, 0x1c, 0x32, 0xb6, 0xb6, 0x9d, 0x5f, 0x4e, 0xa9, 0xff, 0xcf, },
+ { 0x37, 0xa6, 0x98, 0x6c, 0xb8, 0x84, 0x7e, 0xdf, 0x09, 0x25, 0xf0, 0xf1, 0x30, 0x9b, 0x54, 0xde, },
+ { 0xa7, 0x05, 0xf0, 0xe6, 0x9d, 0xa9, 0xa8, 0xf9, 0x07, 0x24, 0x1a, 0x2e, 0x92, 0x3c, 0x8c, 0xc8, },
+ { 0x3d, 0xc4, 0x7d, 0x1f, 0x29, 0xc4, 0x48, 0x46, 0x1e, 0x9e, 0x76, 0xed, 0x90, 0x4f, 0x67, 0x11, },
+ { 0x0d, 0x62, 0xbf, 0x01, 0xe6, 0xfc, 0x0e, 0x1a, 0x0d, 0x3c, 0x47, 0x51, 0xc5, 0xd3, 0x69, 0x2b, },
+ { 0x8c, 0x03, 0x46, 0x8b, 0xca, 0x7c, 0x66, 0x9e, 0xe4, 0xfd, 0x5e, 0x08, 0x4b, 0xbe, 0xe7, 0xb5, },
+ { 0x52, 0x8a, 0x5b, 0xb9, 0x3b, 0xaf, 0x2c, 0x9c, 0x44, 0x73, 0xcc, 0xe5, 0xd0, 0xd2, 0x2b, 0xd9, },
+ { 0xdf, 0x6a, 0x30, 0x1e, 0x95, 0xc9, 0x5d, 0xad, 0x97, 0xae, 0x0c, 0xc8, 0xc6, 0x91, 0x3b, 0xd8, },
+ { 0x80, 0x11, 0x89, 0x90, 0x2c, 0x85, 0x7f, 0x39, 0xe7, 0x35, 0x91, 0x28, 0x5e, 0x70, 0xb6, 0xdb, },
+ { 0xe6, 0x17, 0x34, 0x6a, 0xc9, 0xc2, 0x31, 0xbb, 0x36, 0x50, 0xae, 0x34, 0xcc, 0xca, 0x0c, 0x5b, },
+ { 0x27, 0xd9, 0x34, 0x37, 0xef, 0xb7, 0x21, 0xaa, 0x40, 0x18, 0x21, 0xdc, 0xec, 0x5a, 0xdf, 0x89, },
+ { 0x89, 0x23, 0x7d, 0x9d, 0xed, 0x9c, 0x5e, 0x78, 0xd8, 0xb1, 0xc9, 0xb1, 0x66, 0xcc, 0x73, 0x42, },
+ { 0x4a, 0x6d, 0x80, 0x91, 0xbf, 0x5e, 0x7d, 0x65, 0x11, 0x89, 0xfa, 0x94, 0xa2, 0x50, 0xb1, 0x4c, },
+ { 0x0e, 0x33, 0xf9, 0x60, 0x55, 0xe7, 0xae, 0x89, 0x3f, 0xfc, 0x0e, 0x3d, 0xcf, 0x49, 0x29, 0x02, },
+ { 0xe6, 0x1c, 0x43, 0x2b, 0x72, 0x0b, 0x19, 0xd1, 0x8e, 0xc8, 0xd8, 0x4b, 0xdc, 0x63, 0x15, 0x1b, },
+ { 0xf7, 0xe5, 0xae, 0xf5, 0x49, 0xf7, 0x82, 0xcf, 0x37, 0x90, 0x55, 0xa6, 0x08, 0x26, 0x9b, 0x16, },
+ { 0x43, 0x8d, 0x03, 0x0f, 0xd0, 0xb7, 0xa5, 0x4f, 0xa8, 0x37, 0xf2, 0xad, 0x20, 0x1a, 0x64, 0x03, },
+ { 0xa5, 0x90, 0xd3, 0xee, 0x4f, 0xbf, 0x04, 0xe3, 0x24, 0x7e, 0x0d, 0x27, 0xf2, 0x86, 0x42, 0x3f, },
+ { 0x5f, 0xe2, 0xc1, 0xa1, 0x72, 0xfe, 0x93, 0xc4, 0xb1, 0x5c, 0xd3, 0x7c, 0xae, 0xf9, 0xf5, 0x38, },
+ { 0x2c, 0x97, 0x32, 0x5c, 0xbd, 0x06, 0xb3, 0x6e, 0xb2, 0x13, 0x3d, 0xd0, 0x8b, 0x3a, 0x01, 0x7c, },
+ { 0x92, 0xc8, 0x14, 0x22, 0x7a, 0x6b, 0xca, 0x94, 0x9f, 0xf0, 0x65, 0x9f, 0x00, 0x2a, 0xd3, 0x9e, },
+ { 0xdc, 0xe8, 0x50, 0x11, 0x0b, 0xd8, 0x32, 0x8c, 0xfb, 0xd5, 0x08, 0x41, 0xd6, 0x91, 0x1d, 0x87, },
+ { 0x67, 0xf1, 0x49, 0x84, 0xc7, 0xda, 0x79, 0x12, 0x48, 0xe3, 0x2b, 0xb5, 0x92, 0x25, 0x83, 0xda, },
+ { 0x19, 0x38, 0xf2, 0xcf, 0x72, 0xd5, 0x4e, 0xe9, 0x7e, 0x94, 0x16, 0x6f, 0xa9, 0x1d, 0x2a, 0x36, },
+ { 0x74, 0x48, 0x1e, 0x96, 0x46, 0xed, 0x49, 0xfe, 0x0f, 0x62, 0x24, 0x30, 0x16, 0x04, 0x69, 0x8e, },
+ { 0x57, 0xfc, 0xa5, 0xde, 0x98, 0xa9, 0xd6, 0xd8, 0x00, 0x64, 0x38, 0xd0, 0x58, 0x3d, 0x8a, 0x1d, },
+ { 0x9f, 0xec, 0xde, 0x1c, 0xef, 0xdc, 0x1c, 0xbe, 0xd4, 0x76, 0x36, 0x74, 0xd9, 0x57, 0x53, 0x59, },
+ { 0xe3, 0x04, 0x0c, 0x00, 0xeb, 0x28, 0xf1, 0x53, 0x66, 0xca, 0x73, 0xcb, 0xd8, 0x72, 0xe7, 0x40, },
+ { 0x76, 0x97, 0x00, 0x9a, 0x6a, 0x83, 0x1d, 0xfe, 0xcc, 0xa9, 0x1c, 0x59, 0x93, 0x67, 0x0f, 0x7a, },
+ { 0x58, 0x53, 0x54, 0x23, 0x21, 0xf5, 0x67, 0xa0, 0x05, 0xd5, 0x47, 0xa4, 0xf0, 0x47, 0x59, 0xbd, },
+ { 0x51, 0x50, 0xd1, 0x77, 0x2f, 0x50, 0x83, 0x4a, 0x50, 0x3e, 0x06, 0x9a, 0x97, 0x3f, 0xbd, 0x7c, },
+ };
+
+ performTest(2, 4, vectors_sip128);
+ }
+
+ private void performTest_4_8()
+ throws Exception
+ {
+ int[][] vectors_sip128 = new int[][] {
+ { 0x1f, 0x64, 0xce, 0x58, 0x6d, 0xa9, 0x04, 0xe9, 0xcf, 0xec, 0xe8, 0x54, 0x83, 0xa7, 0x0a, 0x6c, },
+ { 0x47, 0x34, 0x5d, 0xa8, 0xef, 0x4c, 0x79, 0x47, 0x6a, 0xf2, 0x7c, 0xa7, 0x91, 0xc7, 0xa2, 0x80, },
+ { 0xe1, 0x49, 0x5f, 0xa3, 0x96, 0xca, 0x2d, 0xc6, 0x22, 0x73, 0x81, 0x5f, 0x18, 0x82, 0x21, 0xa4, },
+ { 0xc7, 0xa2, 0x73, 0x84, 0x4a, 0xc5, 0x4e, 0x83, 0x5a, 0x9c, 0xb6, 0x7f, 0x81, 0x05, 0x76, 0x02, },
+ { 0x54, 0x1f, 0x52, 0xbb, 0xf4, 0x3e, 0xce, 0x4e, 0x2a, 0x95, 0xc8, 0xe0, 0x1f, 0x65, 0x6d, 0xef, },
+ { 0x17, 0x97, 0x3b, 0xd4, 0x0d, 0xf3, 0x48, 0x15, 0x24, 0x4f, 0x99, 0x0c, 0xbf, 0x12, 0xbe, 0x5d, },
+ { 0x6b, 0x0b, 0x36, 0x0d, 0x56, 0x32, 0x80, 0xcd, 0xb1, 0x7d, 0x56, 0xc9, 0x08, 0xe1, 0xf5, 0xff, },
+ { 0xed, 0x00, 0xe1, 0x3b, 0x18, 0x4b, 0xf1, 0xc2, 0x72, 0x6b, 0x8b, 0x54, 0xff, 0xd2, 0xee, 0xe0, },
+ { 0xa7, 0xd9, 0x46, 0x13, 0x8f, 0xf9, 0xed, 0xf5, 0x36, 0x4a, 0x5a, 0x23, 0xaf, 0xca, 0xe0, 0x63, },
+ { 0x9e, 0x73, 0x14, 0xb7, 0x54, 0x5c, 0xec, 0xa3, 0x8b, 0x9a, 0x55, 0x49, 0xe4, 0xfb, 0x0b, 0xe8, },
+ { 0x58, 0x6c, 0x62, 0xc6, 0x84, 0x89, 0xd1, 0x68, 0xae, 0xe6, 0x5b, 0x88, 0x9a, 0xb9, 0x12, 0x75, },
+ { 0xe6, 0x71, 0x52, 0xa6, 0x4c, 0xa3, 0xd1, 0x47, 0xc4, 0xab, 0x84, 0x1e, 0x2f, 0x2e, 0x7a, 0x99, },
+ { 0x7f, 0x1c, 0x7a, 0xea, 0x90, 0x8d, 0xe5, 0x2e, 0x3e, 0x9e, 0x08, 0x83, 0xee, 0xa8, 0x16, 0xaf, },
+ { 0xde, 0x82, 0x7a, 0xbf, 0x92, 0xb7, 0x33, 0x92, 0x3f, 0x35, 0x33, 0x0d, 0xb5, 0xef, 0x4a, 0x34, },
+ { 0x59, 0x75, 0x63, 0x64, 0x0f, 0x37, 0x9a, 0xc5, 0x37, 0x67, 0x8e, 0xe2, 0x35, 0x4c, 0x7d, 0xf9, },
+ { 0x28, 0x4d, 0x03, 0x30, 0x3a, 0x45, 0x3a, 0x59, 0x3d, 0x78, 0xf7, 0xfa, 0xdc, 0x90, 0x62, 0xcb, },
+ { 0x91, 0x4a, 0xc7, 0xa2, 0x59, 0x7f, 0x63, 0xb7, 0xc0, 0xfd, 0xe5, 0xab, 0x8d, 0x4e, 0xad, 0x9c, },
+ { 0x0d, 0x51, 0x15, 0xa4, 0x4b, 0xa4, 0x55, 0xee, 0x3a, 0x45, 0x3b, 0x95, 0xce, 0x87, 0xc3, 0xcb, },
+ { 0x54, 0x9b, 0x93, 0x9d, 0x0b, 0xf1, 0xd8, 0x94, 0x83, 0x37, 0x88, 0x5a, 0x84, 0xce, 0x79, 0x14, },
+ { 0x6c, 0x17, 0x97, 0x69, 0xcd, 0x34, 0x8a, 0xeb, 0xd2, 0xfb, 0x13, 0x57, 0x8c, 0x72, 0xb4, 0x6c, },
+ { 0xaa, 0xd0, 0x36, 0xc1, 0x38, 0xc9, 0x57, 0xe0, 0x68, 0x2a, 0x00, 0xee, 0x2f, 0x86, 0x40, 0x8b, },
+ { 0x21, 0xb1, 0xee, 0xc4, 0x2f, 0xb6, 0x70, 0xbf, 0xee, 0x90, 0x44, 0xff, 0x4e, 0xd7, 0x3a, 0x26, },
+ { 0x05, 0x93, 0xa1, 0xd6, 0x29, 0x97, 0xed, 0x37, 0x46, 0x53, 0xc9, 0x17, 0x46, 0x3f, 0x14, 0xeb, },
+ { 0x11, 0x3d, 0x31, 0x62, 0x77, 0x19, 0xf9, 0x1e, 0xa0, 0xf1, 0xff, 0xc6, 0x86, 0x57, 0xe2, 0x4e, },
+ { 0xb3, 0x39, 0x4c, 0xf7, 0x2d, 0xe0, 0x6a, 0xdd, 0x0e, 0x73, 0x14, 0xf0, 0xc2, 0x52, 0xc4, 0xd6, },
+ { 0x92, 0x2a, 0x98, 0xda, 0x9d, 0x35, 0xc3, 0x41, 0xe2, 0x45, 0x6b, 0xe4, 0xcd, 0x63, 0x89, 0xd2, },
+ { 0x59, 0x6b, 0x62, 0x30, 0xf7, 0x57, 0xb3, 0x4a, 0xa2, 0xdc, 0xea, 0x50, 0xcb, 0xb2, 0x8d, 0x4d, },
+ { 0xc2, 0x4e, 0xe4, 0x97, 0xd5, 0x5b, 0x7e, 0x80, 0x06, 0x84, 0xdf, 0x75, 0x65, 0x59, 0xee, 0x48, },
+ { 0x5e, 0x9c, 0xb6, 0xa1, 0x36, 0x68, 0x1e, 0xd4, 0x5e, 0x2b, 0x9d, 0xe4, 0xdc, 0x01, 0x81, 0x77, },
+ { 0xbf, 0xfa, 0x39, 0xca, 0x86, 0x56, 0xd3, 0x04, 0x79, 0x33, 0xed, 0xfe, 0x9d, 0x81, 0x78, 0xb2, },
+ { 0x18, 0x22, 0x94, 0x18, 0xa1, 0xd0, 0x79, 0x5a, 0x35, 0x7a, 0x80, 0x3a, 0x81, 0x34, 0xae, 0xa3, },
+ { 0x4a, 0x3e, 0x96, 0xff, 0x53, 0x47, 0x4e, 0x2e, 0x73, 0x7b, 0x69, 0x57, 0x1a, 0x77, 0xb0, 0x6e, },
+ { 0xfe, 0xd5, 0xf0, 0xf9, 0xd0, 0x37, 0x72, 0x84, 0x2e, 0x2f, 0x57, 0x2f, 0x63, 0xf1, 0x94, 0x50, },
+ { 0x39, 0x33, 0x58, 0x86, 0xc1, 0xf9, 0x42, 0x63, 0xc4, 0x0c, 0x66, 0x29, 0xc6, 0xbc, 0x44, 0x6f, },
+ { 0xee, 0xa5, 0xf9, 0x3b, 0xb3, 0x87, 0x10, 0xb0, 0x8b, 0x2c, 0x46, 0x97, 0x19, 0x8b, 0xbf, 0x9f, },
+ { 0x80, 0x6e, 0xc7, 0xb6, 0x70, 0x4f, 0x72, 0x0e, 0x37, 0x43, 0x12, 0x06, 0x61, 0x66, 0xd4, 0x3a, },
+ { 0x6e, 0x69, 0xed, 0x9d, 0xf0, 0xc9, 0x39, 0xb4, 0x9d, 0xaf, 0xee, 0xae, 0x60, 0x47, 0xb2, 0xa2, },
+ { 0x93, 0xc7, 0x7b, 0xf2, 0x98, 0xb6, 0xf9, 0xc7, 0x94, 0xa2, 0x30, 0x17, 0x7f, 0x2f, 0xd7, 0x38, },
+ { 0xff, 0xad, 0x9c, 0xd9, 0x8c, 0x2a, 0xa8, 0x75, 0xda, 0xff, 0x3a, 0x2a, 0x4c, 0xe6, 0x0c, 0xe6, },
+ { 0x4d, 0x99, 0x2f, 0xfd, 0xf9, 0x4a, 0x93, 0xcd, 0xcd, 0x64, 0xef, 0x76, 0x57, 0xf5, 0x10, 0xe3, },
+ { 0x32, 0x70, 0x62, 0x4e, 0x24, 0xe0, 0xa1, 0x1e, 0xa1, 0x86, 0xe0, 0x96, 0xbe, 0x1b, 0xce, 0x9b, },
+ { 0x31, 0xe8, 0xbb, 0xe0, 0xcb, 0x4e, 0xff, 0x51, 0x1f, 0xff, 0xc7, 0xc4, 0x09, 0x34, 0x31, 0x77, },
+ { 0xcb, 0xe1, 0x7d, 0x05, 0x87, 0x9a, 0xd9, 0x07, 0x64, 0x8a, 0x12, 0xa0, 0x70, 0x16, 0xab, 0x5b, },
+ { 0x88, 0x48, 0xd4, 0x43, 0x70, 0xe9, 0x8b, 0xe2, 0xd5, 0xd2, 0x8b, 0x46, 0x36, 0x6a, 0x0a, 0xfc, },
+ { 0xb7, 0xff, 0xd1, 0xb2, 0x42, 0x10, 0x76, 0xa9, 0x0c, 0xb5, 0xcf, 0x65, 0x54, 0x09, 0x5e, 0x0c, },
+ { 0x6a, 0x6b, 0x66, 0x6c, 0xd5, 0x23, 0xa8, 0xf6, 0xbb, 0xd8, 0x84, 0xfe, 0x1f, 0xd1, 0x05, 0x0c, },
+ { 0xa8, 0xfe, 0x8a, 0x83, 0x50, 0xfb, 0xf5, 0xc8, 0x05, 0xf1, 0x8c, 0xbd, 0x30, 0x13, 0x62, 0x24, },
+ { 0xcc, 0xe7, 0x11, 0x7a, 0xee, 0x82, 0x36, 0xf2, 0xeb, 0x3a, 0x96, 0x94, 0xd5, 0x7e, 0x62, 0xb5, },
+ { 0x3a, 0x25, 0xf0, 0xe4, 0xfc, 0x28, 0xb7, 0x0c, 0x6b, 0x30, 0x90, 0xba, 0xfe, 0xf6, 0x9f, 0x04, },
+ { 0x3f, 0x05, 0xe6, 0x26, 0x74, 0x9f, 0xc4, 0x8b, 0x81, 0x06, 0xf8, 0xe4, 0x44, 0x31, 0xdd, 0x4a, },
+ { 0x76, 0x68, 0x79, 0xf9, 0x76, 0x72, 0x16, 0x5c, 0x0a, 0xff, 0xd5, 0xfa, 0xdc, 0x77, 0x34, 0x5b, },
+ { 0x43, 0x71, 0xa0, 0x5a, 0xb6, 0x6c, 0x59, 0x8b, 0xc9, 0xc2, 0x84, 0x94, 0xa1, 0xdd, 0x2f, 0x0e, },
+ { 0x65, 0xf8, 0x5b, 0xd3, 0xa2, 0xa5, 0xf1, 0xba, 0x1f, 0x22, 0xb6, 0xef, 0xd6, 0xe0, 0x02, 0x66, },
+ { 0x76, 0xcf, 0x61, 0xda, 0xe5, 0x4b, 0x22, 0xef, 0xca, 0x6a, 0x9f, 0x22, 0x8a, 0xaf, 0x66, 0x11, },
+ { 0x6c, 0xdc, 0xc2, 0xe3, 0x9f, 0xdb, 0xa2, 0x9f, 0x88, 0x53, 0x90, 0xab, 0x9d, 0xa4, 0x84, 0xda, },
+ { 0xe1, 0xee, 0xac, 0xea, 0xcc, 0x3b, 0x67, 0xb2, 0xd8, 0xe4, 0xe2, 0x61, 0x7b, 0x2f, 0xaa, 0x5a, },
+ { 0x0b, 0xd2, 0x9f, 0x6f, 0x4c, 0xe1, 0x0f, 0x17, 0x78, 0xd6, 0xb0, 0x2e, 0xd5, 0xab, 0x5a, 0x6d, },
+ { 0xad, 0x18, 0x9f, 0x15, 0x6a, 0x52, 0x26, 0x7c, 0xe0, 0x87, 0x45, 0x83, 0x5b, 0x65, 0xa6, 0x07, },
+ { 0x0f, 0x6b, 0x99, 0x71, 0x72, 0x25, 0x66, 0xd4, 0x3d, 0xec, 0x6b, 0x99, 0xe3, 0x1c, 0x21, 0x8f, },
+ { 0xa1, 0xa4, 0xc8, 0xfa, 0x4f, 0x3d, 0xf4, 0x66, 0xd3, 0xf3, 0x9c, 0x6f, 0x3d, 0x9e, 0x1a, 0x74, },
+ { 0x3b, 0x1a, 0x3d, 0xb8, 0x8c, 0xf0, 0xc2, 0x1f, 0xc1, 0xa6, 0xd8, 0xa7, 0x2d, 0x9e, 0xf9, 0x1d, },
+ { 0xd1, 0x48, 0x68, 0x02, 0xef, 0xc0, 0x00, 0x28, 0x56, 0xc3, 0x63, 0x5a, 0x8a, 0x69, 0x2e, 0xe5, },
+ { 0xee, 0xa1, 0x5f, 0x8f, 0x7c, 0xae, 0x19, 0x99, 0xfd, 0x56, 0x49, 0x31, 0xc2, 0x2c, 0x1c, 0x3c, },
+ { 0x63, 0xf5, 0xae, 0x63, 0x28, 0xc4, 0xdb, 0x93, 0x20, 0x79, 0x61, 0xee, 0x90, 0x6b, 0xd4, 0xa5, },
+ };
+
+ performTest(4, 8, vectors_sip128);
+ }
+
+ private void performTest(int cRounds, int dRounds, int[][] testvectorsInt)
+ throws Exception
+ {
+ int n = testvectorsInt.length;
+ int macSize = testvectorsInt[0].length;
+
+ byte[][] testvectors = new byte[n][];
+ for (int i = 0; i < n; i++) {
+ testvectors[i] = new byte[macSize];
+ for (int j = 0; j < macSize; j++) {
+ testvectors[i][j] = (byte) testvectorsInt[i][j];
+ }
+ }
+
+ byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
+
+ for (int i = 0; i < n; i++) {
+ byte[] input = new byte[i];
+ for (int j = 0; j < input.length; j++) {
+ input[j] = (byte) j;
+ }
+
+ runMAC(cRounds, dRounds, testvectors[i], key, input);
+ }
+
+ SecureRandom random = new SecureRandom();
+ for (int i = 0; i < 100; ++i)
+ {
+ randomTest(cRounds, dRounds, random);
+ }
+ }
+
+ private void runMAC(int cRounds, int dRounds, byte[] expected, byte[] key, byte[] input)
+ throws Exception {
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_BYTES);
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_FULL);
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_MIX);
+ }
+
+ private void runMAC(int cRounds, int dRounds, byte[] expected, byte[] key, byte[] input,
+ int updateType)
+ throws Exception
+ {
+ SipHash128 mac = new SipHash128(cRounds, dRounds);
+ mac.init(new KeyParameter(key));
+
+ updateMAC(mac, input, updateType);
+
+ byte[] output = new byte[mac.getMacSize()];
+ int len = mac.doFinal(output, 0);
+ if (len != output.length)
+ {
+ fail("Result length does not equal getMacSize() for doFinal(byte[],int)");
+ }
+ if (!areEqual(expected, output))
+ {
+ fail("Result does not match expected value for doFinal(byte[],int)");
+ }
+ }
+
+ private void randomTest(int cRounds, int dRounds, SecureRandom random)
+ {
+ byte[] key = new byte[16];
+ random.nextBytes(key);
+
+ int length = 1 + RNGUtils.nextInt(random, 1024);
+ byte[] input = new byte[length];
+ random.nextBytes(input);
+
+ SipHash128 mac = new SipHash128(cRounds, dRounds);
+ mac.init(new KeyParameter(key));
+
+ updateMAC(mac, input, UPDATE_BYTES);
+ byte[] result1 = new byte[16];
+ mac.doFinal(result1, 0);
+
+ updateMAC(mac, input, UPDATE_FULL);
+ byte[] result2 = new byte[16];
+ mac.doFinal(result2, 0);
+
+ updateMAC(mac, input, UPDATE_MIX);
+ byte[] result3 = new byte[16];
+ mac.doFinal(result3, 0);
+
+ if (!Arrays.areEqual(result1, result2) ||
+ !Arrays.areEqual(result1, result3))
+ {
+ fail("Inconsistent results in random test");
+ }
+ }
+
+ private void updateMAC(SipHash128 mac, byte[] input, int updateType)
+ {
+ switch (updateType)
+ {
+ case UPDATE_BYTES:
+ {
+ for (int i = 0; i < input.length; ++i)
+ {
+ mac.update(input[i]);
+ }
+ break;
+ }
+ case UPDATE_FULL:
+ {
+ mac.update(input, 0, input.length);
+ break;
+ }
+ case UPDATE_MIX:
+ {
+ int step = Math.max(1, input.length / 3);
+ int pos = 0;
+ while (pos < input.length)
+ {
+ mac.update(input[pos++]);
+ int len = Math.min(input.length - pos, step);
+ mac.update(input, pos, len);
+ pos += len;
+ }
+ break;
+ }
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ runTest(new SipHash128Test());
+ }
+}
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java b/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java
index 2b63f6d88..ee7ea154b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java
+++ b/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java
@@ -4,13 +4,18 @@
import org.bouncycastle.crypto.macs.SipHash;
import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.util.Arrays;
import org.bouncycastle.util.Pack;
import org.bouncycastle.util.encoders.Hex;
import org.bouncycastle.util.test.SimpleTest;
/*
- * SipHash test values from "SipHash: a fast short-input PRF", by Jean-Philippe
- * Aumasson and Daniel J. Bernstein (https://131002.net/siphash/siphash.pdf), Appendix A.
+ * SipHash test values are taken from the output of the C reference implementations:
+ * section "const uint8_t vectors_sip64[64][8]" of the output of command ./vectors.
+ *
+ * For SipHash-2-4, test values from "SipHash: a fast short-input PRF", by Jean-Philippe
+ * Aumasson and Daniel J. Bernstein (https://131002.net/siphash/siphash.pdf), Appendix A
+ * will also be evaluated.
*/
public class SipHashTest
extends SimpleTest
@@ -27,39 +32,228 @@ public String getName()
public void performTest()
throws Exception
{
+ performTest_2_4();
+ performTest_4_8();
+ }
+
+ private void performTest_2_4()
+ throws Exception
+ {
+ /* Explicit test of the
+ * SipHash test values from "SipHash: a fast short-input PRF", by Jean-Philippe
+ * Aumasson and Daniel J. Bernstein (https://131002.net/siphash/siphash.pdf), Appendix A.
+ */
byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
byte[] input = Hex.decode("000102030405060708090a0b0c0d0e");
+ byte[] expected = Hex.decode("e545be4961ca29a1");
+ runMAC(2, 4, expected, key, input);
+
+ /* SipHash test values are taken from the output of the C reference implementations:
+ * section "const uint8_t vectors_sip64[64][8]" of the output of command ./vectors.
+ */
+ int[][] vectors_sip64 = new int[][] {
+ { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, },
+ { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, },
+ { 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, },
+ { 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, },
+ { 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, },
+ { 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, },
+ { 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, },
+ { 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, },
+ { 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, },
+ { 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, },
+ { 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, },
+ { 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, },
+ { 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, },
+ { 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, },
+ { 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, },
+ { 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, },
+ { 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, },
+ { 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, },
+ { 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, },
+ { 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, },
+ { 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, },
+ { 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, },
+ { 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, },
+ { 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, },
+ { 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, },
+ { 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, },
+ { 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, },
+ { 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, },
+ { 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, },
+ { 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, },
+ { 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, },
+ { 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, },
+ { 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, },
+ { 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, },
+ { 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, },
+ { 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, },
+ { 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, },
+ { 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, },
+ { 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, },
+ { 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, },
+ { 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, },
+ { 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, },
+ { 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, },
+ { 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, },
+ { 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, },
+ { 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, },
+ { 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, },
+ { 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, },
+ { 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, },
+ { 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, },
+ { 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, },
+ { 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, },
+ { 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, },
+ { 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, },
+ { 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, },
+ { 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, },
+ { 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, },
+ { 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, },
+ { 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, },
+ { 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, },
+ { 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, },
+ { 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, },
+ { 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, },
+ { 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, },
+ };
+
+ performTest(2, 4, vectors_sip64);
+ }
+
+ private void performTest_4_8()
+ throws Exception
+ {
+ /* SipHash test values are taken from the output of the C reference implementations:
+ * section "const uint8_t vectors_sip64[64][8]" of the output of command ./vectors.
+ */
+ int[][] vectors_sip64 = new int[][] {
+ { 0x41, 0xda, 0x38, 0x99, 0x2b, 0x05, 0x79, 0xc8, },
+ { 0x51, 0xb8, 0x95, 0x52, 0xf9, 0x14, 0x59, 0xc8, },
+ { 0x92, 0x37, 0x16, 0xf0, 0xbe, 0xdd, 0xc3, 0x33, },
+ { 0x6a, 0x46, 0xd4, 0x7d, 0x65, 0x47, 0xc1, 0x05, },
+ { 0xc2, 0x38, 0x59, 0x2b, 0x4a, 0xc1, 0xfa, 0x48, },
+ { 0xf6, 0xc2, 0xd7, 0xd9, 0xcf, 0x52, 0x47, 0xe1, },
+ { 0x6b, 0xb6, 0xbc, 0x34, 0xc8, 0x35, 0x55, 0x8e, },
+ { 0x47, 0xd7, 0x3f, 0x71, 0x5a, 0xbe, 0xfd, 0x4e, },
+ { 0x20, 0xb5, 0x8b, 0x9c, 0x07, 0x2f, 0xdb, 0x50, },
+ { 0x36, 0x31, 0x9a, 0xf3, 0x5e, 0xe1, 0x12, 0x53, },
+ { 0x48, 0xa9, 0xd0, 0xdb, 0x0a, 0x8d, 0x84, 0x8f, },
+ { 0xcc, 0x69, 0x39, 0x60, 0x36, 0x04, 0x0a, 0x81, },
+ { 0x4b, 0x6d, 0x68, 0x53, 0x7a, 0xa7, 0x97, 0x61, },
+ { 0x29, 0x37, 0x96, 0xe9, 0xf2, 0xc9, 0x50, 0x69, },
+ { 0x88, 0x43, 0x1b, 0xea, 0xa7, 0x62, 0x9a, 0x68, },
+ { 0xe0, 0xa6, 0xa9, 0x7d, 0xd5, 0x89, 0xd3, 0x83, },
+ { 0x55, 0x9c, 0xf5, 0x53, 0x80, 0xb2, 0xac, 0x70, },
+ { 0xd5, 0xb7, 0xc5, 0x11, 0x7a, 0xe3, 0x79, 0x4e, },
+ { 0x5a, 0x3c, 0x45, 0x46, 0x34, 0xad, 0x10, 0x2b, },
+ { 0xc0, 0xa4, 0x80, 0xaf, 0xa3, 0x5a, 0x3d, 0xbc, },
+ { 0x78, 0xc2, 0x27, 0x09, 0xe5, 0x28, 0x4b, 0xc8, },
+ { 0xef, 0x26, 0x70, 0x46, 0x0d, 0xeb, 0xd6, 0x9d, },
+ { 0xd9, 0x76, 0xef, 0x86, 0xa9, 0xd0, 0x84, 0xd8, },
+ { 0xe3, 0xd9, 0x81, 0x18, 0x19, 0xea, 0xd0, 0xe8, },
+ { 0x89, 0x33, 0x3c, 0xb5, 0x3e, 0xea, 0xec, 0x16, },
+ { 0x31, 0x15, 0x6c, 0x5f, 0x64, 0x73, 0x49, 0xc6, },
+ { 0xa5, 0x4c, 0xce, 0x35, 0x35, 0x76, 0x32, 0xa4, },
+ { 0x06, 0x5d, 0x89, 0x25, 0xc0, 0xa7, 0xd2, 0xfe, },
+ { 0x2b, 0xbb, 0xaa, 0x82, 0x22, 0x1a, 0x3a, 0x8b, },
+ { 0x87, 0x0b, 0xfb, 0xce, 0x64, 0x09, 0x7b, 0x70, },
+ { 0x40, 0xd8, 0xe0, 0xf9, 0x64, 0x95, 0xee, 0x8b, },
+ { 0x79, 0xfc, 0xa7, 0xf4, 0x0b, 0xfa, 0xdf, 0x12, },
+ { 0x00, 0x0b, 0xfb, 0xf2, 0x2f, 0x76, 0x9e, 0xd2, },
+ { 0x40, 0x68, 0x55, 0x91, 0xf8, 0xe5, 0x22, 0xfa, },
+ { 0x2b, 0xe6, 0xfe, 0x74, 0xd8, 0x14, 0x9d, 0x0d, },
+ { 0xba, 0x7e, 0x2f, 0x0e, 0x0b, 0x75, 0x60, 0xed, },
+ { 0x02, 0xe9, 0xe3, 0x84, 0xed, 0xa7, 0xe1, 0x97, },
+ { 0xc4, 0xe8, 0x0a, 0x62, 0x95, 0x27, 0x63, 0xb6, },
+ { 0x83, 0x27, 0xed, 0xc6, 0x5d, 0x5c, 0x6d, 0xd3, },
+ { 0x79, 0xfc, 0x64, 0xd1, 0x64, 0xa4, 0x2f, 0xc0, },
+ { 0x15, 0x4a, 0x75, 0x11, 0xcb, 0xfc, 0x61, 0x4e, },
+ { 0x8b, 0x14, 0x8d, 0x7c, 0xec, 0xa0, 0xe6, 0x6f, },
+ { 0xdf, 0xee, 0x69, 0xb6, 0x54, 0xc4, 0x03, 0xfa, },
+ { 0xc5, 0x8f, 0x36, 0xa6, 0x69, 0x7b, 0xb7, 0xc9, },
+ { 0xa6, 0xc5, 0xbe, 0x9c, 0x05, 0xc6, 0x31, 0x21, },
+ { 0xb5, 0x8a, 0x87, 0x59, 0xfb, 0xcd, 0x89, 0x31, },
+ { 0xd7, 0x68, 0x3a, 0x67, 0x04, 0xcc, 0xc4, 0x25, },
+ { 0xcb, 0x6a, 0xe6, 0xe1, 0xe5, 0xa2, 0x44, 0x8d, },
+ { 0x6e, 0x26, 0x69, 0x5b, 0x3a, 0x3a, 0x51, 0x73, },
+ { 0x78, 0x71, 0x07, 0xcf, 0x9f, 0x33, 0xac, 0x4a, },
+ { 0x16, 0x75, 0x90, 0xda, 0xd9, 0x7b, 0x74, 0x84, },
+ { 0x00, 0x6b, 0x68, 0x1e, 0xf0, 0x6b, 0xf3, 0x06, },
+ { 0x1c, 0x9b, 0x30, 0x02, 0x66, 0xef, 0xcf, 0xa6, },
+ { 0x28, 0x8d, 0x2f, 0x88, 0xd1, 0xb0, 0xb3, 0x4b, },
+ { 0xe0, 0x11, 0x06, 0xbd, 0xac, 0xf5, 0x6b, 0xfe, },
+ { 0xc0, 0x10, 0x1f, 0x0e, 0x5b, 0x6e, 0x03, 0x28, },
+ { 0xc3, 0xa7, 0x91, 0x45, 0x5b, 0x1b, 0x1c, 0x0a, },
+ { 0x57, 0x07, 0xaf, 0xe1, 0x9e, 0x0b, 0x3a, 0x0f, },
+ { 0xe6, 0x5a, 0x72, 0x29, 0xfe, 0x53, 0x59, 0x4f, },
+ { 0x00, 0x2f, 0x9d, 0xb9, 0xab, 0x1a, 0xaf, 0x4c, },
+ { 0x59, 0x28, 0xcb, 0x50, 0x44, 0xc1, 0x06, 0x06, },
+ { 0xd5, 0x38, 0x01, 0x96, 0x7b, 0x85, 0x73, 0x21, },
+ { 0x05, 0xdb, 0x36, 0x4f, 0x1a, 0x09, 0x99, 0xcc, },
+ { 0xe6, 0x77, 0x84, 0xbc, 0x55, 0x03, 0xde, 0x23, },
+ };
+
+ performTest(4, 8, vectors_sip64);
+ }
+
+ private void performTest(int cRounds, int dRounds, int[][] testvectorsInt)
+ throws Exception
+ {
+ int n = testvectorsInt.length;
+ int macSize = testvectorsInt[0].length;
+
+ byte[][] testvectors = new byte[n][];
+ for (int i = 0; i < n; i++) {
+ testvectors[i] = new byte[macSize];
+ for (int j = 0; j < macSize; j++) {
+ testvectors[i][j] = (byte) testvectorsInt[i][j];
+ }
+ }
+
+ byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
+
+ for (int i = 0; i < n; i++) {
+ byte[] input = new byte[i];
+ for (int j = 0; j < input.length; j++) {
+ input[j] = (byte) j;
+ }
+
+ runMAC(cRounds, dRounds, testvectors[i], key, input);
+ }
- runMAC(key, input, UPDATE_BYTES);
- runMAC(key, input, UPDATE_FULL);
- runMAC(key, input, UPDATE_MIX);
-
SecureRandom random = new SecureRandom();
for (int i = 0; i < 100; ++i)
{
- randomTest(random);
+ randomTest(cRounds, dRounds, random);
}
}
- private void runMAC(byte[] key, byte[] input, int updateType)
+ private void runMAC(int cRounds, int dRounds, byte[] expected, byte[] key, byte[] input)
+ throws Exception {
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_BYTES);
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_FULL);
+ runMAC(cRounds, dRounds, expected, key, input, UPDATE_MIX);
+ }
+
+ private void runMAC(int cRounds, int dRounds, byte[] expected, byte[] key, byte[] input,
+ int updateType)
throws Exception
{
- long expected = 0xa129ca6149be45e5L;
+ long expectedLong = Pack.littleEndianToLong(expected, 0);
- SipHash mac = new SipHash();
+ SipHash mac = new SipHash(cRounds, dRounds);
mac.init(new KeyParameter(key));
updateMAC(mac, input, updateType);
long result = mac.doFinal();
- if (expected != result)
+
+ if (expectedLong != result)
{
fail("Result does not match expected value for doFinal()");
}
- byte[] expectedBytes = new byte[8];
- Pack.longToLittleEndian(expected, expectedBytes, 0);
-
updateMAC(mac, input, updateType);
byte[] output = new byte[mac.getMacSize()];
@@ -68,13 +262,13 @@ private void runMAC(byte[] key, byte[] input, int updateType)
{
fail("Result length does not equal getMacSize() for doFinal(byte[],int)");
}
- if (!areEqual(expectedBytes, output))
+ if (!areEqual(expected, output))
{
fail("Result does not match expected value for doFinal(byte[],int)");
}
}
- private void randomTest(SecureRandom random)
+ private void randomTest(int cRounds, int dRounds, SecureRandom random)
{
byte[] key = new byte[16];
random.nextBytes(key);
@@ -83,19 +277,23 @@ private void randomTest(SecureRandom random)
byte[] input = new byte[length];
random.nextBytes(input);
- SipHash mac = new SipHash();
+ SipHash mac = new SipHash(cRounds, dRounds);
mac.init(new KeyParameter(key));
updateMAC(mac, input, UPDATE_BYTES);
- long result1 = mac.doFinal();
+ byte[] result1 = new byte[16];
+ mac.doFinal(result1, 0);
updateMAC(mac, input, UPDATE_FULL);
- long result2 = mac.doFinal();
+ byte[] result2 = new byte[16];
+ mac.doFinal(result2, 0);
updateMAC(mac, input, UPDATE_MIX);
- long result3 = mac.doFinal();
+ byte[] result3 = new byte[16];
+ mac.doFinal(result3, 0);
- if (result1 != result2 || result1 != result3)
+ if (!Arrays.areEqual(result1, result2) ||
+ !Arrays.areEqual(result1, result3))
{
fail("Inconsistent results in random test");
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash128.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash128.java
new file mode 100644
index 000000000..018a80256
--- /dev/null
+++ b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash128.java
@@ -0,0 +1,62 @@
+package org.bouncycastle.jcajce.provider.symmetric;
+
+import org.bouncycastle.crypto.CipherKeyGenerator;
+import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+
+public final class SipHash128
+{
+ private SipHash128()
+ {
+ }
+
+ public static class Mac24
+ extends BaseMac
+ {
+ public Mac24()
+ {
+ super(new org.bouncycastle.crypto.macs.SipHash128());
+ }
+ }
+
+ public static class Mac48
+ extends BaseMac
+ {
+ public Mac48()
+ {
+ super(new org.bouncycastle.crypto.macs.SipHash128(4, 8));
+ }
+ }
+
+ public static class KeyGen
+ extends BaseKeyGenerator
+ {
+ public KeyGen()
+ {
+ super("SipHash128", 128, new CipherKeyGenerator());
+ }
+ }
+
+ public static class Mappings
+ extends AlgorithmProvider
+ {
+ private static final String PREFIX = SipHash128.class.getName();
+
+ public Mappings()
+ {
+ }
+
+ public void configure(ConfigurableProvider provider)
+ {
+ provider.addAlgorithm("Mac.SIPHASH128-2-4", PREFIX + "$Mac24");
+ provider.addAlgorithm("Alg.Alias.Mac.SIPHASH128", "SIPHASH128-2-4");
+ provider.addAlgorithm("Mac.SIPHASH128-4-8", PREFIX + "$Mac48");
+
+ provider.addAlgorithm("KeyGenerator.SIPHASH128", PREFIX + "$KeyGen");
+ provider.addAlgorithm("Alg.Alias.KeyGenerator.SIPHASH128-2-4", "SIPHASH128");
+ provider.addAlgorithm("Alg.Alias.KeyGenerator.SIPHASH128-4-8", "SIPHASH128");
+ }
+ }
+}
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index 44e71883f..cccd032f5 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -78,7 +78,7 @@
private static final String[] SYMMETRIC_MACS =
{
- "SipHash", "Poly1305"
+ "SipHash", "SipHash128", "Poly1305"
};
private static final String[] SYMMETRIC_CIPHERS =
diff --git a/prov/src/test/java/org/bouncycastle/jce/provider/test/SipHash128Test.java b/prov/src/test/java/org/bouncycastle/jce/provider/test/SipHash128Test.java
new file mode 100644
index 000000000..9183ef989
--- /dev/null
+++ b/prov/src/test/java/org/bouncycastle/jce/provider/test/SipHash128Test.java
@@ -0,0 +1,129 @@
+package org.bouncycastle.jce.provider.test;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Security;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.encoders.Hex;
+import org.bouncycastle.util.test.SimpleTest;
+
+public class SipHash128Test
+ extends SimpleTest
+{
+ public void performTest()
+ throws Exception
+ {
+ testMac();
+ testKeyGenerator();
+ }
+
+ private void testKeyGenerator()
+ throws NoSuchAlgorithmException,
+ NoSuchProviderException
+ {
+ testKeyGen("SipHash128");
+ testKeyGen("SipHash128-2-4");
+ testKeyGen("SipHash128-4-8");
+ }
+
+ private void testKeyGen(String algorithm)
+ throws NoSuchAlgorithmException,
+ NoSuchProviderException
+ {
+ KeyGenerator kg = KeyGenerator.getInstance(algorithm, "BC");
+
+ SecretKey key = kg.generateKey();
+
+ if (!key.getAlgorithm().equalsIgnoreCase("SipHash128"))
+ {
+ fail("Unexpected algorithm name in key", "SipHash128", key.getAlgorithm());
+ }
+ if (key.getEncoded().length != 16)
+ {
+ fail("Expected 128 bit key");
+ }
+ }
+
+ private void testMac()
+ throws NoSuchAlgorithmException,
+ NoSuchProviderException,
+ InvalidKeyException
+ {
+ byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
+ byte[] input = Hex.decode("000102030405060708090a0b0c0d0e");
+
+ byte[] expected = Hex.decode("5493e99933b0a8117e08ec0f97cfc3d9");
+
+ Mac mac = Mac.getInstance("SipHash128", "BC");
+
+ mac.init(new SecretKeySpec(key, "SipHash128"));
+
+ mac.update(input, 0, input.length);
+
+ byte[] result = mac.doFinal();
+
+ if (!Arrays.areEqual(expected, result))
+ {
+ fail("Result does not match expected value for doFinal()");
+ }
+
+ mac.init(new SecretKeySpec(key, "SipHash128-2-4"));
+
+ mac.update(input, 0, input.length);
+
+ result = mac.doFinal();
+ if (!Arrays.areEqual(expected, result))
+ {
+ fail("Result does not match expected value for second doFinal()");
+ }
+
+ mac = Mac.getInstance("SipHash128-2-4", "BC");
+
+ mac.init(new SecretKeySpec(key, "SipHash128-2-4"));
+
+ mac.update(input, 0, input.length);
+
+ result = mac.doFinal();
+ if (!Arrays.areEqual(expected, result))
+ {
+ fail("Result does not match expected value for alias");
+ }
+
+ // SipHash128 4-8
+ expected = Hex.decode("284d03303a453a593d78f7fadc9062cb");
+
+ mac = Mac.getInstance("SipHash128-4-8", "BC");
+
+ mac.init(new SecretKeySpec(key, "SipHash128"));
+
+ mac.update(input, 0, input.length);
+
+ result = mac.doFinal();
+
+ if (!Arrays.areEqual(expected, result))
+ {
+ fail("Result does not match expected value for SipHash128 4-8");
+ }
+ }
+
+ public String getName()
+ {
+ return "SipHash128";
+ }
+
+ public static void main(
+ String[] args)
+ {
+ Security.addProvider(new BouncyCastleProvider());
+
+ runTest(new SipHash128Test());
+ }
+}
| 0
|
1ec216e5735816899f193d10be3f0151d1658b79
|
https://github.com/zherczeg/jerryscript/commit/1ec216e5735816899f193d10be3f0151d1658b79
|
Fixing test262 built-ins symbol test-cases (#4123)
The remaining test-cases needs realm feature
JerryScript-DCO-1.0-Signed-off-by: bence gabor kis [email protected]
|
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h
index 7d871f548e..840a91a367 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-symbol.inc.h
@@ -30,7 +30,7 @@ NUMBER_VALUE (LIT_MAGIC_STRING_LENGTH,
ECMA_PROPERTY_FLAG_CONFIGURABLE)
STRING_VALUE (LIT_MAGIC_STRING_NAME,
- LIT_MAGIC_STRING_STRING_UL,
+ LIT_MAGIC_STRING_SYMBOL_UL,
ECMA_PROPERTY_FLAG_CONFIGURABLE)
/* Object properties:
diff --git a/jerry-core/ecma/operations/ecma-symbol-object.c b/jerry-core/ecma/operations/ecma-symbol-object.c
index 272186f5a5..8f8e831e96 100644
--- a/jerry-core/ecma/operations/ecma-symbol-object.c
+++ b/jerry-core/ecma/operations/ecma-symbol-object.c
@@ -50,7 +50,7 @@ ecma_op_create_symbol (const ecma_value_t *arguments_list_p, /**< list of argume
ecma_value_t string_desc;
/* 1-3. */
- if (arguments_list_len == 0)
+ if (arguments_list_len == 0 || ecma_is_value_undefined (arguments_list_p[0]))
{
string_desc = ECMA_VALUE_UNDEFINED;
}
diff --git a/tests/test262-esnext-excludelist.xml b/tests/test262-esnext-excludelist.xml
index 045f23711e..36ef44ffb6 100644
--- a/tests/test262-esnext-excludelist.xml
+++ b/tests/test262-esnext-excludelist.xml
@@ -1613,7 +1613,6 @@
<test id="built-ins/String/prototype/toLowerCase/special_casing_conditional.js"><reason></reason></test>
<test id="built-ins/String/prototype/toString/non-generic-realm.js"><reason></reason></test>
<test id="built-ins/String/prototype/valueOf/non-generic-realm.js"><reason></reason></test>
- <test id="built-ins/String/symbol-string-coercion.js"><reason></reason></test>
<test id="built-ins/Symbol/asyncIterator/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/for/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/hasInstance/cross-realm.js"><reason></reason></test>
@@ -1623,11 +1622,6 @@
<test id="built-ins/Symbol/match/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/matchAll/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/matchAll/prop-desc.js"><reason></reason></test>
- <test id="built-ins/Symbol/name.js"><reason></reason></test>
- <test id="built-ins/Symbol/prototype/description/get.js"><reason></reason></test>
- <test id="built-ins/Symbol/prototype/description/this-val-symbol.js"><reason></reason></test>
- <test id="built-ins/Symbol/prototype/description/wrapper.js"><reason></reason></test>
- <test id="built-ins/Symbol/prototype/toString/undefined.js"><reason></reason></test>
<test id="built-ins/Symbol/replace/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/search/cross-realm.js"><reason></reason></test>
<test id="built-ins/Symbol/species/cross-realm.js"><reason></reason></test>
| 0
|
964a3fcf6efa645188d1fb0bc3f5a3198a8bdbae
|
https://github.com/vanilla/vanilla/commit/964a3fcf6efa645188d1fb0bc3f5a3198a8bdbae
|
Removed the eval() statement from conversations.js to remove possible xss attack vector.
|
diff --git a/applications/conversations/js/conversations.js b/applications/conversations/js/conversations.js
index 6d022da9d13..5079c2bd224 100755
--- a/applications/conversations/js/conversations.js
+++ b/applications/conversations/js/conversations.js
@@ -126,7 +126,7 @@ jQuery(document).ready(function($) {
success: function(json) {
gdn.inform(json);
if (json.RedirectUrl)
- setTimeout("document.location='" + json.RedirectUrl + "';", 300);
+ setTimeout(function() { window.location.replace(json.RedirectUrl); }, 300);
}
});
return false;
| 1
|
6e25a73347528da1801e22319ed198f9c62bb83b
|
https://github.com/eclipse/rdf4j/commit/6e25a73347528da1801e22319ed198f9c62bb83b
|
Merge pull request #2695 from eclipse/releases/3.5.0
next development iteration: 3.5.1-SNAPSHOT
|
diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
index c439a67116..9e71a6c311 100644
--- a/.github/workflows/pr-verify.yml
+++ b/.github/workflows/pr-verify.yml
@@ -24,7 +24,7 @@ jobs:
- name: Verify formatting
run: mvn -B formatter:validate impsort:check xml-format:xml-check
- name: Build
- run: mvn -B clean install -Pquick,\!formatting
+ run: mvn -B clean install -Pquick,\!formatting -Djapicmp.skip
- name: Run tests
run: mvn -B verify -Pcompliance,\!formatting --file pom.xml
- name: Print test failures
diff --git a/assembly-descriptors/pom.xml b/assembly-descriptors/pom.xml
index b7714926d6..2da4888910 100644
--- a/assembly-descriptors/pom.xml
+++ b/assembly-descriptors/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly-descriptors</artifactId>
<name>RDF4J Assembly Descriptors</name>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index fe1a451106..bf640fa897 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly</artifactId>
<packaging>pom</packaging>
diff --git a/bom/pom.xml b/bom/pom.xml
index 211e51e34f..204ca2037f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-bom</artifactId>
<packaging>pom</packaging>
diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml
index 02de68495a..8f5985ad94 100644
--- a/compliance/elasticsearch/pom.xml
+++ b/compliance/elasticsearch/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-elasticsearch-compliance</artifactId>
<name>RDF4J Elasticsearch Sail Tests</name>
diff --git a/compliance/geosparql/pom.xml b/compliance/geosparql/pom.xml
index 0ada102c72..86989c0182 100644
--- a/compliance/geosparql/pom.xml
+++ b/compliance/geosparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-geosparql-compliance</artifactId>
<name>RDF4J GeoSPARQL compliance tests</name>
diff --git a/compliance/lucene/pom.xml b/compliance/lucene/pom.xml
index 9160b34544..c0a5963732 100644
--- a/compliance/lucene/pom.xml
+++ b/compliance/lucene/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-lucene-compliance</artifactId>
<name>RDF4J Lucene Sail Tests</name>
diff --git a/compliance/model/pom.xml b/compliance/model/pom.xml
index c0bb347a5c..ff31de3552 100644
--- a/compliance/model/pom.xml
+++ b/compliance/model/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rdf4j-compliance</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rdf4j-model-compliance</artifactId>
diff --git a/compliance/pom.xml b/compliance/pom.xml
index 69284f8e8b..e2eb7c9b8f 100644
--- a/compliance/pom.xml
+++ b/compliance/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-compliance</artifactId>
<packaging>pom</packaging>
diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml
index eb04ca882d..21425785ad 100644
--- a/compliance/repository/pom.xml
+++ b/compliance/repository/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-compliance</artifactId>
<packaging>war</packaging>
diff --git a/compliance/rio/pom.xml b/compliance/rio/pom.xml
index 88c66fcd2d..ff5e00639e 100644
--- a/compliance/rio/pom.xml
+++ b/compliance/rio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-compliance</artifactId>
<name>RDF4J Rio compliance tests</name>
diff --git a/compliance/serql/pom.xml b/compliance/serql/pom.xml
index d922186efa..8d7e1afdb2 100644
--- a/compliance/serql/pom.xml
+++ b/compliance/serql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-serql-compliance</artifactId>
<name>RDF4J SeRQL query parser compliance tests</name>
diff --git a/compliance/shacl/pom.xml b/compliance/shacl/pom.xml
index fd88bf7cc6..1ebc68c4c1 100644
--- a/compliance/shacl/pom.xml
+++ b/compliance/shacl/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-shacl-compliance</artifactId>
<name>RDF4J SHACL compliance tests</name>
diff --git a/compliance/solr/pom.xml b/compliance/solr/pom.xml
index 77724abf3b..bd1e8ca0a5 100644
--- a/compliance/solr/pom.xml
+++ b/compliance/solr/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-solr-compliance</artifactId>
<name>RDF4J Solr Sail Tests</name>
diff --git a/compliance/sparql/pom.xml b/compliance/sparql/pom.xml
index 423f3800b2..ceafbd40eb 100644
--- a/compliance/sparql/pom.xml
+++ b/compliance/sparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sparql-compliance</artifactId>
<packaging>war</packaging>
diff --git a/core/client/pom.xml b/core/client/pom.xml
index 5206c4330b..d236db4d7d 100644
--- a/core/client/pom.xml
+++ b/core/client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-client</artifactId>
<name>RDF4J: Client Libraries</name>
diff --git a/core/http/client/pom.xml b/core/http/client/pom.xml
index a80b9b175f..59d03e7f8e 100644
--- a/core/http/client/pom.xml
+++ b/core/http/client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-http</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-client</artifactId>
<name>RDF4J: HTTP client</name>
diff --git a/core/http/pom.xml b/core/http/pom.xml
index 1bcffd104e..179934fe73 100644
--- a/core/http/pom.xml
+++ b/core/http/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http</artifactId>
<packaging>pom</packaging>
diff --git a/core/http/protocol/pom.xml b/core/http/protocol/pom.xml
index 6a4a47705c..e71dba0fa7 100644
--- a/core/http/protocol/pom.xml
+++ b/core/http/protocol/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-http</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-protocol</artifactId>
<name>RDF4J: HTTP protocol</name>
diff --git a/core/model-api/pom.xml b/core/model-api/pom.xml
index 17ebcce1b4..e835a63551 100644
--- a/core/model-api/pom.xml
+++ b/core/model-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model-api</artifactId>
<name>RDF4J: Model API</name>
diff --git a/core/model-vocabulary/pom.xml b/core/model-vocabulary/pom.xml
index 46a0042eb1..16ff8aea95 100644
--- a/core/model-vocabulary/pom.xml
+++ b/core/model-vocabulary/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model-vocabulary</artifactId>
<name>RDF4J: RDF Vocabularies</name>
diff --git a/core/model/pom.xml b/core/model/pom.xml
index 8078886e67..c2ddeccac3 100644
--- a/core/model/pom.xml
+++ b/core/model/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model</artifactId>
<name>RDF4J: Model</name>
diff --git a/core/pom.xml b/core/pom.xml
index 0e945efd35..8a771be730 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-core</artifactId>
<packaging>pom</packaging>
diff --git a/core/query/pom.xml b/core/query/pom.xml
index 43317080db..8662d40c8c 100644
--- a/core/query/pom.xml
+++ b/core/query/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-query</artifactId>
<name>RDF4J: Query</name>
diff --git a/core/queryalgebra/evaluation/pom.xml b/core/queryalgebra/evaluation/pom.xml
index 39526af8a6..929a046302 100644
--- a/core/queryalgebra/evaluation/pom.xml
+++ b/core/queryalgebra/evaluation/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryalgebra</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryalgebra-evaluation</artifactId>
<name>RDF4J: Query algebra - evaluation</name>
diff --git a/core/queryalgebra/geosparql/pom.xml b/core/queryalgebra/geosparql/pom.xml
index 754dfda1ba..32b12b06e2 100644
--- a/core/queryalgebra/geosparql/pom.xml
+++ b/core/queryalgebra/geosparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryalgebra</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryalgebra-geosparql</artifactId>
<name>RDF4J: Query algebra - GeoSPARQL</name>
diff --git a/core/queryalgebra/model/pom.xml b/core/queryalgebra/model/pom.xml
index ef7ff206a7..677ae0fbfb 100644
--- a/core/queryalgebra/model/pom.xml
+++ b/core/queryalgebra/model/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryalgebra</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryalgebra-model</artifactId>
<name>RDF4J: Query algebra - model</name>
diff --git a/core/queryalgebra/pom.xml b/core/queryalgebra/pom.xml
index d5da53495a..253570f765 100644
--- a/core/queryalgebra/pom.xml
+++ b/core/queryalgebra/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryalgebra</artifactId>
<packaging>pom</packaging>
diff --git a/core/queryparser/api/pom.xml b/core/queryparser/api/pom.xml
index d35c9c508b..a6711965f4 100644
--- a/core/queryparser/api/pom.xml
+++ b/core/queryparser/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryparser</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryparser-api</artifactId>
<name>RDF4J: Query parser - API</name>
diff --git a/core/queryparser/pom.xml b/core/queryparser/pom.xml
index 113d46f58d..5f261c314d 100644
--- a/core/queryparser/pom.xml
+++ b/core/queryparser/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryparser</artifactId>
<packaging>pom</packaging>
diff --git a/core/queryparser/serql/pom.xml b/core/queryparser/serql/pom.xml
index c4c96891b9..80d4e1d4f3 100644
--- a/core/queryparser/serql/pom.xml
+++ b/core/queryparser/serql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryparser</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryparser-serql</artifactId>
<name>RDF4J: Query parser - SeRQL</name>
diff --git a/core/queryparser/sparql/pom.xml b/core/queryparser/sparql/pom.xml
index a43f526642..1df86e2e52 100644
--- a/core/queryparser/sparql/pom.xml
+++ b/core/queryparser/sparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryparser</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryparser-sparql</artifactId>
<name>RDF4J: Query parser - SPARQL</name>
diff --git a/core/queryrender/pom.xml b/core/queryrender/pom.xml
index ff55f9262e..9e1d9b2425 100644
--- a/core/queryrender/pom.xml
+++ b/core/queryrender/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryrender</artifactId>
<name>RDF4J: Query Rendering</name>
diff --git a/core/queryresultio/api/pom.xml b/core/queryresultio/api/pom.xml
index d9755e5f3d..e352e4f357 100644
--- a/core/queryresultio/api/pom.xml
+++ b/core/queryresultio/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-api</artifactId>
<name>RDF4J: Query result IO - API</name>
diff --git a/core/queryresultio/binary/pom.xml b/core/queryresultio/binary/pom.xml
index a35a569e06..3180fd98e4 100644
--- a/core/queryresultio/binary/pom.xml
+++ b/core/queryresultio/binary/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-binary</artifactId>
<name>RDF4J: Query result IO - binary</name>
diff --git a/core/queryresultio/pom.xml b/core/queryresultio/pom.xml
index c8d0f962a9..97d649f18a 100644
--- a/core/queryresultio/pom.xml
+++ b/core/queryresultio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio</artifactId>
<packaging>pom</packaging>
diff --git a/core/queryresultio/sparqljson/pom.xml b/core/queryresultio/sparqljson/pom.xml
index a113bea7f6..41e7d78f20 100644
--- a/core/queryresultio/sparqljson/pom.xml
+++ b/core/queryresultio/sparqljson/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-sparqljson</artifactId>
<name>RDF4J: Query result IO - SPARQL/JSON</name>
diff --git a/core/queryresultio/sparqlxml/pom.xml b/core/queryresultio/sparqlxml/pom.xml
index 4e83cfd7fc..8d59ca4fc2 100644
--- a/core/queryresultio/sparqlxml/pom.xml
+++ b/core/queryresultio/sparqlxml/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-sparqlxml</artifactId>
<name>RDF4J: Query result IO - SPARQL/XML</name>
diff --git a/core/queryresultio/text/pom.xml b/core/queryresultio/text/pom.xml
index 532d93323c..4c820e6aba 100644
--- a/core/queryresultio/text/pom.xml
+++ b/core/queryresultio/text/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-queryresultio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-text</artifactId>
<name>RDF4J: Query result IO - plain text booleans</name>
diff --git a/core/repository/api/pom.xml b/core/repository/api/pom.xml
index 5cb3fbbc5c..61114c06aa 100644
--- a/core/repository/api/pom.xml
+++ b/core/repository/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-api</artifactId>
<name>RDF4J: Repository - API</name>
diff --git a/core/repository/contextaware/pom.xml b/core/repository/contextaware/pom.xml
index b01f6543da..171c035ea0 100644
--- a/core/repository/contextaware/pom.xml
+++ b/core/repository/contextaware/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-contextaware</artifactId>
<name>RDF4J: Repository - context aware (wrapper)</name>
diff --git a/core/repository/dataset/pom.xml b/core/repository/dataset/pom.xml
index 2c91cf5b05..6f9473c19c 100644
--- a/core/repository/dataset/pom.xml
+++ b/core/repository/dataset/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-dataset</artifactId>
<name>RDF4J: DatasetRepository (wrapper)</name>
diff --git a/core/repository/event/pom.xml b/core/repository/event/pom.xml
index 1fd2aa2779..b2083cdbe6 100644
--- a/core/repository/event/pom.xml
+++ b/core/repository/event/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-event</artifactId>
<name>RDF4J: Repository - event (wrapper)</name>
diff --git a/core/repository/http/pom.xml b/core/repository/http/pom.xml
index 5e5e4cf2b2..c75458e083 100644
--- a/core/repository/http/pom.xml
+++ b/core/repository/http/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-http</artifactId>
<name>RDF4J: HTTPRepository</name>
diff --git a/core/repository/manager/pom.xml b/core/repository/manager/pom.xml
index a36c0a31b1..23fd4bf11f 100644
--- a/core/repository/manager/pom.xml
+++ b/core/repository/manager/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-manager</artifactId>
<name>RDF4J: Repository manager</name>
diff --git a/core/repository/pom.xml b/core/repository/pom.xml
index 14817ee9c3..2d38333393 100644
--- a/core/repository/pom.xml
+++ b/core/repository/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository</artifactId>
<packaging>pom</packaging>
diff --git a/core/repository/sail/pom.xml b/core/repository/sail/pom.xml
index 0fb8596e51..fef1afb069 100644
--- a/core/repository/sail/pom.xml
+++ b/core/repository/sail/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-sail</artifactId>
<name>RDF4J: SailRepository</name>
diff --git a/core/repository/sparql/pom.xml b/core/repository/sparql/pom.xml
index f7d1d60281..256c89a9df 100644
--- a/core/repository/sparql/pom.xml
+++ b/core/repository/sparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-sparql</artifactId>
<name>RDF4J: SPARQL Repository</name>
diff --git a/core/rio/api/pom.xml b/core/rio/api/pom.xml
index e492d72360..81112effa3 100644
--- a/core/rio/api/pom.xml
+++ b/core/rio/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-api</artifactId>
<name>RDF4J: Rio - API</name>
diff --git a/core/rio/binary/pom.xml b/core/rio/binary/pom.xml
index b1a3aa774d..ed99bcf060 100644
--- a/core/rio/binary/pom.xml
+++ b/core/rio/binary/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-binary</artifactId>
<name>RDF4J: Rio - Binary</name>
diff --git a/core/rio/datatypes/pom.xml b/core/rio/datatypes/pom.xml
index 714cfab55a..41cd3c2527 100644
--- a/core/rio/datatypes/pom.xml
+++ b/core/rio/datatypes/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-datatypes</artifactId>
<name>RDF4J: Rio - Datatypes</name>
diff --git a/core/rio/hdt/pom.xml b/core/rio/hdt/pom.xml
index 3ff5fd17d2..29214c8ad2 100644
--- a/core/rio/hdt/pom.xml
+++ b/core/rio/hdt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-hdt</artifactId>
<packaging>jar</packaging>
diff --git a/core/rio/jsonld/pom.xml b/core/rio/jsonld/pom.xml
index d745380913..d1b1691f1d 100644
--- a/core/rio/jsonld/pom.xml
+++ b/core/rio/jsonld/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-jsonld</artifactId>
<name>RDF4J: Rio - JSON-LD</name>
diff --git a/core/rio/languages/pom.xml b/core/rio/languages/pom.xml
index d81a643b93..a91387dfee 100644
--- a/core/rio/languages/pom.xml
+++ b/core/rio/languages/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-languages</artifactId>
<name>RDF4J: Rio - Languages</name>
diff --git a/core/rio/n3/pom.xml b/core/rio/n3/pom.xml
index c646ba93f3..9912d98d5b 100644
--- a/core/rio/n3/pom.xml
+++ b/core/rio/n3/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-n3</artifactId>
<name>RDF4J: Rio - N3 (writer-only)</name>
diff --git a/core/rio/nquads/pom.xml b/core/rio/nquads/pom.xml
index ed5ce783cf..cbdecb00dd 100644
--- a/core/rio/nquads/pom.xml
+++ b/core/rio/nquads/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-nquads</artifactId>
<name>RDF4J: Rio - N-Quads</name>
diff --git a/core/rio/ntriples/pom.xml b/core/rio/ntriples/pom.xml
index a8688ac68b..6cd59fad53 100644
--- a/core/rio/ntriples/pom.xml
+++ b/core/rio/ntriples/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-ntriples</artifactId>
<name>RDF4J: Rio - N-Triples</name>
diff --git a/core/rio/pom.xml b/core/rio/pom.xml
index 176d84a5c3..b4dbad3463 100644
--- a/core/rio/pom.xml
+++ b/core/rio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio</artifactId>
<packaging>pom</packaging>
diff --git a/core/rio/rdfjson/pom.xml b/core/rio/rdfjson/pom.xml
index 68dfd77735..3bd7bc66f3 100644
--- a/core/rio/rdfjson/pom.xml
+++ b/core/rio/rdfjson/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-rdfjson</artifactId>
<name>RDF4J: Rio - RDF/JSON</name>
diff --git a/core/rio/rdfxml/pom.xml b/core/rio/rdfxml/pom.xml
index 7df344c844..de0b2729dc 100644
--- a/core/rio/rdfxml/pom.xml
+++ b/core/rio/rdfxml/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<name>RDF4J: Rio - RDF/XML</name>
diff --git a/core/rio/trig/pom.xml b/core/rio/trig/pom.xml
index 7fcce14311..0b9b0f3b7b 100644
--- a/core/rio/trig/pom.xml
+++ b/core/rio/trig/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-trig</artifactId>
<name>RDF4J: Rio - TriG</name>
diff --git a/core/rio/trix/pom.xml b/core/rio/trix/pom.xml
index 4d34fd7c0c..aa4b0a559e 100644
--- a/core/rio/trix/pom.xml
+++ b/core/rio/trix/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-trix</artifactId>
<name>RDF4J: Rio - TriX</name>
diff --git a/core/rio/turtle/pom.xml b/core/rio/turtle/pom.xml
index d83e4cf18e..9e92021619 100644
--- a/core/rio/turtle/pom.xml
+++ b/core/rio/turtle/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-turtle</artifactId>
<name>RDF4J: Rio - Turtle</name>
diff --git a/core/sail/api/pom.xml b/core/sail/api/pom.xml
index 7f5aad0fdc..223f952a69 100644
--- a/core/sail/api/pom.xml
+++ b/core/sail/api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-api</artifactId>
<name>RDF4J: Sail API</name>
diff --git a/core/sail/base/pom.xml b/core/sail/base/pom.xml
index 6c7ed8b3cb..25ab208df9 100644
--- a/core/sail/base/pom.xml
+++ b/core/sail/base/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-base</artifactId>
<name>RDF4J: Sail base implementations</name>
diff --git a/core/sail/elasticsearch-store/pom.xml b/core/sail/elasticsearch-store/pom.xml
index 27a810b83b..651f6011d5 100644
--- a/core/sail/elasticsearch-store/pom.xml
+++ b/core/sail/elasticsearch-store/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-elasticsearch-store</artifactId>
<name>RDF4J Elasticsearch Store</name>
diff --git a/core/sail/elasticsearch/pom.xml b/core/sail/elasticsearch/pom.xml
index a1ad85d42b..a06db6cbd9 100644
--- a/core/sail/elasticsearch/pom.xml
+++ b/core/sail/elasticsearch/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-elasticsearch</artifactId>
<name>RDF4J Elastic Search Sail Index</name>
diff --git a/core/sail/extensible-store/pom.xml b/core/sail/extensible-store/pom.xml
index 33dc741996..f3b9f04a58 100644
--- a/core/sail/extensible-store/pom.xml
+++ b/core/sail/extensible-store/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-extensible-store</artifactId>
<name>RDF4J Extensible Store</name>
diff --git a/core/sail/federation/pom.xml b/core/sail/federation/pom.xml
index 41f2543af6..f1deb4a05b 100644
--- a/core/sail/federation/pom.xml
+++ b/core/sail/federation/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-federation</artifactId>
<name>RDF4J: Federation SAIL</name>
diff --git a/core/sail/inferencer/pom.xml b/core/sail/inferencer/pom.xml
index c5cc74f328..9d6c4de24b 100644
--- a/core/sail/inferencer/pom.xml
+++ b/core/sail/inferencer/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-inferencer</artifactId>
<name>RDF4J: Inferencer Sails</name>
diff --git a/core/sail/lucene-api/pom.xml b/core/sail/lucene-api/pom.xml
index 1cc22c9335..1fe35d4e4c 100644
--- a/core/sail/lucene-api/pom.xml
+++ b/core/sail/lucene-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-lucene-api</artifactId>
<name>RDF4J Lucene Sail API</name>
diff --git a/core/sail/lucene-spin/pom.xml b/core/sail/lucene-spin/pom.xml
index 09cd672bf5..b0d477e2a2 100644
--- a/core/sail/lucene-spin/pom.xml
+++ b/core/sail/lucene-spin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rdf4j-sail</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-lucene-spin</artifactId>
<name>RDF4J Lucene Sail Spin</name>
diff --git a/core/sail/lucene/pom.xml b/core/sail/lucene/pom.xml
index f25e813f7f..532c517584 100644
--- a/core/sail/lucene/pom.xml
+++ b/core/sail/lucene/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-lucene</artifactId>
<name>RDF4J Lucene Sail Index</name>
diff --git a/core/sail/memory/pom.xml b/core/sail/memory/pom.xml
index cab0148515..e2f8ca0710 100644
--- a/core/sail/memory/pom.xml
+++ b/core/sail/memory/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-memory</artifactId>
<name>RDF4J: MemoryStore</name>
diff --git a/core/sail/model/pom.xml b/core/sail/model/pom.xml
index bea59cc784..9d9bf339c3 100644
--- a/core/sail/model/pom.xml
+++ b/core/sail/model/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-model</artifactId>
<name>RDF4J: Sail Model</name>
diff --git a/core/sail/nativerdf/pom.xml b/core/sail/nativerdf/pom.xml
index 73e6dc8ccb..6feb7db8d1 100644
--- a/core/sail/nativerdf/pom.xml
+++ b/core/sail/nativerdf/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-nativerdf</artifactId>
<name>RDF4J: NativeStore</name>
diff --git a/core/sail/pom.xml b/core/sail/pom.xml
index 75311ca0c1..13506c0538 100644
--- a/core/sail/pom.xml
+++ b/core/sail/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail</artifactId>
<packaging>pom</packaging>
diff --git a/core/sail/sail-spin/pom.xml b/core/sail/sail-spin/pom.xml
index 8dde4c02ff..3cad699615 100644
--- a/core/sail/sail-spin/pom.xml
+++ b/core/sail/sail-spin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-spin</artifactId>
<name>RDF4J: SPIN SAIL</name>
diff --git a/core/sail/shacl/pom.xml b/core/sail/shacl/pom.xml
index 598e0291ad..418cafeed8 100644
--- a/core/sail/shacl/pom.xml
+++ b/core/sail/shacl/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-shacl</artifactId>
<name>RDF4J: SHACL</name>
diff --git a/core/sail/solr/pom.xml b/core/sail/solr/pom.xml
index abb2ae55aa..636fb0bc19 100644
--- a/core/sail/solr/pom.xml
+++ b/core/sail/solr/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-solr</artifactId>
<name>RDF4J Solr Sail Index</name>
diff --git a/core/sparqlbuilder/pom.xml b/core/sparqlbuilder/pom.xml
index a4725fb466..e9a807c1ed 100644
--- a/core/sparqlbuilder/pom.xml
+++ b/core/sparqlbuilder/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sparqlbuilder</artifactId>
<name>RDF4J: SparqlBuilder</name>
diff --git a/core/spin/pom.xml b/core/spin/pom.xml
index b56b79b376..427f588599 100644
--- a/core/spin/pom.xml
+++ b/core/spin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-spin</artifactId>
<name>RDF4J: SPIN</name>
diff --git a/core/storage/pom.xml b/core/storage/pom.xml
index 64d3c4216c..c787534bf0 100644
--- a/core/storage/pom.xml
+++ b/core/storage/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-storage</artifactId>
<name>RDF4J: Storage Libraries</name>
diff --git a/core/util/pom.xml b/core/util/pom.xml
index aa2c0b57e7..7d2cbd50ab 100644
--- a/core/util/pom.xml
+++ b/core/util/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-util</artifactId>
<name>RDF4J: util</name>
diff --git a/examples/pom.xml b/examples/pom.xml
index 5b323312a1..8be413b04e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 7616189522..00f812810e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Eclipse RDF4J</name>
<description>An extensible Java framework for RDF and SPARQL</description>
diff --git a/testsuites/benchmark/pom.xml b/testsuites/benchmark/pom.xml
index d105026471..778c5fe101 100644
--- a/testsuites/benchmark/pom.xml
+++ b/testsuites/benchmark/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-benchmark</artifactId>
<name>RDF4J: benchmarks</name>
diff --git a/testsuites/geosparql/pom.xml b/testsuites/geosparql/pom.xml
index 6688dddc7b..f28d77b94c 100644
--- a/testsuites/geosparql/pom.xml
+++ b/testsuites/geosparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-geosparql-testsuite</artifactId>
<name>RDF4J GeoSPARQL compliance test suite</name>
diff --git a/testsuites/lucene/pom.xml b/testsuites/lucene/pom.xml
index 194a1fbe2e..c30fe86066 100644
--- a/testsuites/lucene/pom.xml
+++ b/testsuites/lucene/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-lucene-testsuite</artifactId>
<name>RDF4J Lucene Sail Tests</name>
diff --git a/testsuites/model/pom.xml b/testsuites/model/pom.xml
index 7cf9fcfef8..39569f56ab 100644
--- a/testsuites/model/pom.xml
+++ b/testsuites/model/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model-testsuite</artifactId>
<name>RDF4J: Model API testsuite</name>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index edb494a1dd..bf84a6e0dd 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-testsuites</artifactId>
<packaging>pom</packaging>
diff --git a/testsuites/queryresultio/pom.xml b/testsuites/queryresultio/pom.xml
index 9d0179578c..0d91d8905d 100644
--- a/testsuites/queryresultio/pom.xml
+++ b/testsuites/queryresultio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-queryresultio-testsuite</artifactId>
<name>RDF4J: QueryResultIO testsuite</name>
diff --git a/testsuites/repository/pom.xml b/testsuites/repository/pom.xml
index 9911392c5b..a6dc6a2523 100644
--- a/testsuites/repository/pom.xml
+++ b/testsuites/repository/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-testsuite</artifactId>
<name>RDF4J: Repository API testsuite</name>
diff --git a/testsuites/rio/pom.xml b/testsuites/rio/pom.xml
index 12f62e43d9..5f8348f35e 100644
--- a/testsuites/rio/pom.xml
+++ b/testsuites/rio/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-testsuite</artifactId>
<name>RDF4J Rio compliance test suite</name>
diff --git a/testsuites/sail/pom.xml b/testsuites/sail/pom.xml
index b1bc1150d9..140231e355 100644
--- a/testsuites/sail/pom.xml
+++ b/testsuites/sail/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sail-testsuite</artifactId>
<name>RDF4J: Sail API testsuite</name>
diff --git a/testsuites/serql/pom.xml b/testsuites/serql/pom.xml
index 093747b3cc..73093da7ad 100644
--- a/testsuites/serql/pom.xml
+++ b/testsuites/serql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-serql-testsuite</artifactId>
<name>RDF4J SeRQL test suite</name>
diff --git a/testsuites/shacl/pom.xml b/testsuites/shacl/pom.xml
index 223693f6b1..fd9f0f6a6b 100644
--- a/testsuites/shacl/pom.xml
+++ b/testsuites/shacl/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-shacl-testsuite</artifactId>
<name>RDF4J SHACL compliance test suite</name>
diff --git a/testsuites/sparql/pom.xml b/testsuites/sparql/pom.xml
index d309319f06..8db3b18977 100644
--- a/testsuites/sparql/pom.xml
+++ b/testsuites/sparql/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-testsuites</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sparql-testsuite</artifactId>
<name>RDF4J SPARQL compliance test suite</name>
diff --git a/tools/config/pom.xml b/tools/config/pom.xml
index 1e0e774b88..adf1a1bd15 100644
--- a/tools/config/pom.xml
+++ b/tools/config/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-config</artifactId>
<name>RDF4J: application configuration</name>
diff --git a/tools/console/pom.xml b/tools/console/pom.xml
index 753070c6a5..3fc59227d1 100644
--- a/tools/console/pom.xml
+++ b/tools/console/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-console</artifactId>
<name>RDF4J: Console</name>
diff --git a/tools/federation/pom.xml b/tools/federation/pom.xml
index d0804c5f4f..d13cd54afc 100644
--- a/tools/federation/pom.xml
+++ b/tools/federation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<build>
<plugins>
diff --git a/tools/pom.xml b/tools/pom.xml
index ed5d1dece0..6ddf1198e4 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
diff --git a/tools/runtime-osgi/pom.xml b/tools/runtime-osgi/pom.xml
index 171ef9a393..778ca5f1fb 100644
--- a/tools/runtime-osgi/pom.xml
+++ b/tools/runtime-osgi/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-runtime-osgi</artifactId>
<packaging>bundle</packaging>
diff --git a/tools/runtime/pom.xml b/tools/runtime/pom.xml
index 7d98e32c47..af60fb6a25 100644
--- a/tools/runtime/pom.xml
+++ b/tools/runtime/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-runtime</artifactId>
<name>RDF4J: Runtime</name>
diff --git a/tools/server-spring/pom.xml b/tools/server-spring/pom.xml
index 30bcb64e48..a9071ab7f8 100644
--- a/tools/server-spring/pom.xml
+++ b/tools/server-spring/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-server-spring</artifactId>
<name>RDF4J: HTTP server - core</name>
diff --git a/tools/server/pom.xml b/tools/server/pom.xml
index ff7326b469..5210127f8e 100644
--- a/tools/server/pom.xml
+++ b/tools/server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-server</artifactId>
<packaging>war</packaging>
diff --git a/tools/workbench/pom.xml b/tools/workbench/pom.xml
index 48f0593d29..3e53878e37 100644
--- a/tools/workbench/pom.xml
+++ b/tools/workbench/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-tools</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-workbench</artifactId>
<packaging>war</packaging>
| 0
|
2ddffb2e7eafe4830e3483a4b437873022c461ba
|
https://github.com/exponentcms/exponent-cms/commit/2ddffb2e7eafe4830e3483a4b437873022c461ba
|
fix security vulnerability to reranking pages; reported by kyohpc
|
diff --git a/framework/modules/navigation/controllers/navigationController.php b/framework/modules/navigation/controllers/navigationController.php
index 90180d6276..ebe59313bf 100644
--- a/framework/modules/navigation/controllers/navigationController.php
+++ b/framework/modules/navigation/controllers/navigationController.php
@@ -39,6 +39,8 @@ class navigationController extends expController {
'move' => 'Move Page',
'remove' => 'Remove Page',
'reparent' => 'Reparent Page',
+ 'dragndroprerank' => 'Rerank Page',
+ 'dragndroprerank2' => 'Rerank Page',
);
public $remove_configs = array(
'aggregation',
@@ -858,8 +860,8 @@ public static function returnChildrenAsJSON2() {
public static function DragnDropReRank() {
global $db, $router;
- $move = $router->params['move'];
- $target = $router->params['target'];
+ $move = intval($router->params['move']);
+ $target = intval($router->params['target']);
$type = $router->params['type'];
$targSec = $db->selectObject("section","id=".$target);
// $targSec = new section($target);
| 1
|
4b01fc89448f8c1ac8d19918a9bc488d32ccdbe7
|
https://github.com/twangboy/salt/commit/4b01fc89448f8c1ac8d19918a9bc488d32ccdbe7
|
Port #51820 to master
|
diff --git a/salt/states/test.py b/salt/states/test.py
index f569bc7f3a260..89dbc912bb710 100644
--- a/salt/states/test.py
+++ b/salt/states/test.py
@@ -44,6 +44,24 @@
- foo
- integer:
- bar
+
+You may also use these states for controlled failure in state definitions, for example if certain conditions in
+pillar or grains do not apply. The following state definition will fail with a message "OS not supported!" when
+`grains['os']` is neither Ubuntu nor CentOS:
+
+.. code-block:: jinja
+
+ {% if grains['os'] in ['Ubuntu', 'CentOS'] %}
+
+ # Your state definitions go here
+
+ {% else %}
+ failure:
+ test.fail_without_changes:
+ - name: "OS not supported!"
+ - failhard: True
+ {% endif %}
+
"""
from __future__ import absolute_import, print_function, unicode_literals
| 0
|
f8589cfb9da2ef1092b006c86841ffa4fcea937a
|
https://github.com/pulp/pulp/commit/f8589cfb9da2ef1092b006c86841ffa4fcea937a
|
Merge pull request #3972 from nathanegillett/8247
Correct last_publish method call in distributor
|
diff --git a/server/pulp/plugins/file/distributor.py b/server/pulp/plugins/file/distributor.py
index 25f8bd14ca..c2b195e3ce 100644
--- a/server/pulp/plugins/file/distributor.py
+++ b/server/pulp/plugins/file/distributor.py
@@ -71,7 +71,7 @@ def publish_repo(self, repo, publish_conduit, config):
:rtype: pulp.plugins.model.PublishReport
"""
_logger.info(_('Beginning publish for repository <%(repo)s>') % {'repo': repo.id})
- if not config.get("force_full", False) and publish_conduit.last_published:
+ if not config.get("force_full", False) and publish_conduit.last_publish:
try:
return self.publish_repo_fast_forward(repo, publish_conduit, config)
except FastForwardUnavailable:
| 0
|
fb65c5fe6d298195beee11324416a975bea6d701
|
https://github.com/apache/tomcat/commit/fb65c5fe6d298195beee11324416a975bea6d701
|
Improve the access checks for linked global resources to handle the case where the current class loader is a child of the web application class loader.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1763232 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/java/org/apache/naming/factory/ResourceLinkFactory.java b/java/org/apache/naming/factory/ResourceLinkFactory.java
index 797401ef183..b09a36a3d74 100644
--- a/java/org/apache/naming/factory/ResourceLinkFactory.java
+++ b/java/org/apache/naming/factory/ResourceLinkFactory.java
@@ -109,9 +109,12 @@ private static void validateGlobalContext(Context globalContext) {
private static boolean validateGlobalResourceAccess(String globalName) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Map<String,String> registrations = globalResourceRegistrations.get(cl);
- if (registrations != null && registrations.containsValue(globalName)) {
- return true;
+ while (cl != null) {
+ Map<String,String> registrations = globalResourceRegistrations.get(cl);
+ if (registrations != null && registrations.containsValue(globalName)) {
+ return true;
+ }
+ cl = cl.getParent();
}
return false;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1b6e5fcc52c..6724add4773 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -102,6 +102,11 @@
When starting web resources, ensure that class resources are only
started once. (markt)
</fix>
+ <fix>
+ Improve the access checks for linked global resources to handle the case
+ where the current class loader is a child of the web application class
+ loader. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
| 1
|
bc5a00795fb87ac743ce09d1494f6866f79f6a8e
|
https://github.com/litecart/litecart/commit/bc5a00795fb87ac743ce09d1494f6866f79f6a8e
|
* Revert commit (Strange behavior on windows not removing all folders)
|
diff --git a/public_html/install/install.php b/public_html/install/install.php
index 2b4c4e17..968fe391 100644
--- a/public_html/install/install.php
+++ b/public_html/install/install.php
@@ -609,22 +609,10 @@
echo ' <span class="error">[Failed]</span></p>' . PHP_EOL . PHP_EOL;
}
- ### Deleting installation files #######################
-
- echo '<p>Deleting installation folder... ';
-
- $files_to_delete = array(
- FS_DIR_APP . 'install/',
- );
-
- foreach ($files_to_delete as $file) {
- file_delete($file);
- }
-
### #############################################################
echo PHP_EOL . '<h2>Complete</h2>' . PHP_EOL
- . '<p>Installation complete!</p>' . PHP_EOL . PHP_EOL
+ . '<p>Installation complete! Please delete the <strong>~/install/</strong> folder.</p>' . PHP_EOL . PHP_EOL
. '<p>You may now log in to the <a href="../'. $_REQUEST['admin_folder'] .'/">administration area</a> and start configuring your store.</p>' . PHP_EOL . PHP_EOL
. '<p>Check out the <a href="https://wiki.litecart.net/" target="_blank">LiteCart Wiki</a> website for some great tips. Turn to our <a href="https://www.litecart.net/forums/" target="_blank">Community Forums</a> if you have questions.</p>' . PHP_EOL . PHP_EOL;
diff --git a/public_html/install/upgrade.php b/public_html/install/upgrade.php
index 4e2d138d..ee01a525 100644
--- a/public_html/install/upgrade.php
+++ b/public_html/install/upgrade.php
@@ -239,20 +239,8 @@
#############################################
- echo '<p>Deleting installation folder... ';
-
- $files_to_delete = array(
- FS_DIR_APP . 'install/',
- );
-
- foreach ($files_to_delete as $file) {
- file_delete($file);
- }
-
- #############################################
-
echo '<h2>Complete</h2>' . PHP_EOL . PHP_EOL
- . '<p style="font-weight: bold;">Upgrade complete!</p>' . PHP_EOL . PHP_EOL;
+ . '<p style="font-weight: bold;">Upgrade complete! Please delete the <strong>~/install/</strong> folder.</p>' . PHP_EOL . PHP_EOL;
if (!empty($_REQUEST['redirect'])) {
header('Location: '. $_REQUEST['redirect']);
| 0
|
9f4a8432cdbb18d96962993ef40989770b9f5f2a
|
https://github.com/OpenRefine/OpenRefine/commit/9f4a8432cdbb18d96962993ef40989770b9f5f2a
|
skip building with Appveyor for only docs (#3538)
* skip building with Appveyor for only docs
* limit to only the docs folder
|
diff --git a/appveyor.yml b/appveyor.yml
index cc7c369fb7..9b111dfccf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,9 @@ init:
clone_depth: 5
skip_branch_with_pr: true
+skip_commits:
+ files:
+ - docs/
environment:
JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
| 0
|
f3ba1a839a35f2ba7f941c15e239a1cb379d56ae
|
https://github.com/rails/rails-html-sanitizer/commit/f3ba1a839a35f2ba7f941c15e239a1cb379d56ae
|
Make sure we address CVE-2018-8048
Even that the issue was fixed on loofah we have our own logic to scrub
attributes so when the whitelist serializer is used the issue was still
present.
Fix CVE-2018-3741.
|
diff --git a/lib/rails/html/scrubbers.rb b/lib/rails/html/scrubbers.rb
index 57c4034..42436f4 100644
--- a/lib/rails/html/scrubbers.rb
+++ b/lib/rails/html/scrubbers.rb
@@ -153,6 +153,8 @@ def scrub_attribute(node, attr_node)
end
node.remove_attribute(attr_node.name) if attr_name == 'src' && attr_node.value !~ /[^[:space:]]/
+
+ Loofah::HTML5::Scrub.force_correct_attribute_escaping! node
end
end
diff --git a/rails-html-sanitizer.gemspec b/rails-html-sanitizer.gemspec
index 698ff4b..e774244 100644
--- a/rails-html-sanitizer.gemspec
+++ b/rails-html-sanitizer.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.test_files = Dir["test/**/*"]
spec.require_paths = ["lib"]
- spec.add_dependency "loofah", "~> 2.0"
+ spec.add_dependency "loofah", "~> 2.2", ">= 2.2.2"
spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "rake"
diff --git a/test/sanitizer_test.rb b/test/sanitizer_test.rb
index 9651c94..7bcab6f 100644
--- a/test/sanitizer_test.rb
+++ b/test/sanitizer_test.rb
@@ -385,13 +385,13 @@ def test_should_sanitize_attributes
def test_should_sanitize_illegal_style_properties
raw = %(display:block; position:absolute; left:0; top:0; width:100%; height:100%; z-index:1; background-color:black; background-image:url(http://www.ragingplatypus.com/i/cam-full.jpg); background-x:center; background-y:center; background-repeat:repeat;)
- expected = %(display: block; width: 100%; height: 100%; background-color: black; background-x: center; background-y: center;)
+ expected = %(display:block;width:100%;height:100%;background-color:black;background-x:center;background-y:center;)
assert_equal expected, sanitize_css(raw)
end
def test_should_sanitize_with_trailing_space
raw = "display:block; "
- expected = "display: block;"
+ expected = "display:block;"
assert_equal expected, sanitize_css(raw)
end
@@ -484,6 +484,38 @@ def test_allow_data_attribute_if_requested
assert_equal %(<a data-foo="foo">foo</a>), white_list_sanitize(text, attributes: ['data-foo'])
end
+ def test_uri_escaping_of_href_attr_in_a_tag_in_white_list_sanitizer
+ html = %{<a href='examp<!--" unsafeattr=foo()>-->le.com'>test</a>}
+
+ text = white_list_sanitize(html)
+
+ assert_equal %{<a href="examp<!--%22%20unsafeattr=foo()>-->le.com">test</a>}, text
+ end
+
+ def test_uri_escaping_of_src_attr_in_a_tag_in_white_list_sanitizer
+ html = %{<a src='examp<!--" unsafeattr=foo()>-->le.com'>test</a>}
+
+ text = white_list_sanitize(html)
+
+ assert_equal %{<a src="examp<!--%22%20unsafeattr=foo()>-->le.com">test</a>}, text
+ end
+
+ def test_uri_escaping_of_name_attr_in_a_tag_in_white_list_sanitizer
+ html = %{<a name='examp<!--" unsafeattr=foo()>-->le.com'>test</a>}
+
+ text = white_list_sanitize(html)
+
+ assert_equal %{<a name="examp<!--%22%20unsafeattr=foo()>-->le.com">test</a>}, text
+ end
+
+ def test_uri_escaping_of_name_action_in_a_tag_in_white_list_sanitizer
+ html = %{<a action='examp<!--" unsafeattr=foo()>-->le.com'>test</a>}
+
+ text = white_list_sanitize(html, attributes: ['action'])
+
+ assert_equal %{<a action="examp<!--%22%20unsafeattr=foo()>-->le.com">test</a>}, text
+ end
+
protected
def xpath_sanitize(input, options = {})
| 1
|
a5e930145908f56fdf1b4e0da26c3297f4a4c353
|
https://github.com/vadz/libtiff/commit/a5e930145908f56fdf1b4e0da26c3297f4a4c353
|
Fix module names in error message
|
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index 8d6686ba..38edb3fb 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -2128,7 +2128,7 @@ TIFFWriteDirectoryTagCheckedLong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* di
assert(count<0x20000000);
assert(sizeof(uint64)==8);
if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
- TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","LONG8 not allowed for ClassicTIFF");
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8Array","LONG8 not allowed for ClassicTIFF");
return(0);
}
if (tif->tif_flags&TIFF_SWAB)
@@ -2143,7 +2143,7 @@ TIFFWriteDirectoryTagCheckedSlong8(TIFF* tif, uint32* ndir, TIFFDirEntry* dir, u
int64 m;
assert(sizeof(int64)==8);
if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
- TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedSlong8","SLONG8 not allowed for ClassicTIFF");
return(0);
}
m=value;
@@ -2159,7 +2159,7 @@ TIFFWriteDirectoryTagCheckedSlong8Array(TIFF* tif, uint32* ndir, TIFFDirEntry* d
assert(count<0x20000000);
assert(sizeof(int64)==8);
if( !(tif->tif_flags&TIFF_BIGTIFF) ) {
- TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedLong8","SLONG8 not allowed for ClassicTIFF");
+ TIFFErrorExt(tif->tif_clientdata,"TIFFWriteDirectoryTagCheckedSlong8Array","SLONG8 not allowed for ClassicTIFF");
return(0);
}
if (tif->tif_flags&TIFF_SWAB)
| 0
|
4500bf901cb2a7312291b6663045f28a95d2a0c4
|
https://github.com/apache/cxf/commit/4500bf901cb2a7312291b6663045f28a95d2a0c4
|
Improved SupportingToken policy validation
git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1338219 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 4962e9b4024..a5d9ba0af80 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -69,6 +69,7 @@
import org.apache.cxf.ws.security.wss4j.CryptoCoverageUtil.CoverageType;
import org.apache.cxf.ws.security.wss4j.policyvalidators.AsymmetricBindingPolicyValidator;
import org.apache.cxf.ws.security.wss4j.policyvalidators.BindingPolicyValidator;
+import org.apache.cxf.ws.security.wss4j.policyvalidators.ConcreteSupportingTokenPolicyValidator;
import org.apache.cxf.ws.security.wss4j.policyvalidators.EncryptedTokenPolicyValidator;
import org.apache.cxf.ws.security.wss4j.policyvalidators.EndorsingEncryptedTokenPolicyValidator;
import org.apache.cxf.ws.security.wss4j.policyvalidators.EndorsingTokenPolicyValidator;
@@ -562,9 +563,6 @@ protected void doResults(
LOG.fine("Incoming request failed supporting token policy validation");
}
- // The supporting tokens are already validated
- assertPolicy(aim, SP12Constants.SUPPORTING_TOKENS);
-
// relatively irrelevant stuff from a verification standpoint
assertPolicy(aim, SP12Constants.LAYOUT);
assertPolicy(aim, SP12Constants.WSS10);
@@ -703,7 +701,13 @@ private boolean checkSupportingTokenCoverage(
boolean check = true;
- SupportingTokenPolicyValidator validator = new SignedTokenPolicyValidator();
+ SupportingTokenPolicyValidator validator = new ConcreteSupportingTokenPolicyValidator();
+ validator.setUsernameTokenResults(utResults, utWithCallbacks);
+ validator.setSAMLTokenResults(samlResults);
+ validator.setTimestampElement(timestamp);
+ check &= validator.validatePolicy(aim, msg, results, signedResults, encryptedResults);
+
+ validator = new SignedTokenPolicyValidator();
validator.setUsernameTokenResults(utResults, utWithCallbacks);
validator.setSAMLTokenResults(samlResults);
validator.setTimestampElement(timestamp);
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
index d044eb7e1eb..1011cc85e09 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
@@ -23,14 +23,30 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.helpers.MapNamespaceContext;
import org.apache.cxf.message.Message;
import org.apache.cxf.security.transport.TLSSessionInfo;
+import org.apache.cxf.ws.security.policy.model.Header;
+import org.apache.cxf.ws.security.policy.model.SignedEncryptedElements;
+import org.apache.cxf.ws.security.policy.model.SignedEncryptedParts;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSSecurityEngine;
@@ -48,6 +64,8 @@
public abstract class AbstractSupportingTokenPolicyValidator
extends AbstractTokenPolicyValidator implements SupportingTokenPolicyValidator {
+ private static final Logger LOG = LogUtils.getL7dLogger(AbstractSupportingTokenPolicyValidator.class);
+
private Message message;
private List<WSSecurityEngineResult> results;
private List<WSSecurityEngineResult> signedResults;
@@ -59,7 +77,11 @@
private boolean signed;
private boolean encrypted;
private boolean derived;
- private boolean endorsed;
+ private boolean endorsed;
+ private SignedEncryptedElements signedElements;
+ private SignedEncryptedElements encryptedElements;
+ private SignedEncryptedParts signedParts;
+ private SignedEncryptedParts encryptedParts;
/**
* Set the list of UsernameToken results
@@ -130,7 +152,7 @@ protected boolean processUsernameTokens() {
tokenResults.addAll(utResults);
List<WSSecurityEngineResult> dktResults = new ArrayList<WSSecurityEngineResult>();
for (WSSecurityEngineResult wser : utResults) {
- if (endorsed && derived) {
+ if (derived) {
byte[] secret = (byte[])wser.get(WSSecurityEngineResult.TAG_SECRET);
WSSecurityEngineResult dktResult = getMatchingDerivedKey(secret);
if (dktResult != null) {
@@ -150,9 +172,10 @@ protected boolean processUsernameTokens() {
return false;
}
tokenResults.addAll(dktResults);
- if (endorsed && !checkEndorsed(tokenResults)) {
+ if ((endorsed && !checkEndorsed(tokenResults)) || !validateSignedEncryptedPolicies(tokenResults)) {
return false;
}
+
return true;
}
@@ -174,6 +197,11 @@ protected boolean processSAMLTokens() {
if (endorsed && !checkEndorsed(samlResults)) {
return false;
}
+
+ if (!validateSignedEncryptedPolicies(samlResults)) {
+ return false;
+ }
+
return true;
}
@@ -190,7 +218,7 @@ protected boolean processKerberosTokens() {
BinarySecurity binarySecurity =
(BinarySecurity)wser.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
if (binarySecurity instanceof KerberosSecurity) {
- if (endorsed && derived) {
+ if (derived) {
byte[] secret = (byte[])wser.get(WSSecurityEngineResult.TAG_SECRET);
WSSecurityEngineResult dktResult = getMatchingDerivedKey(secret);
if (dktResult != null) {
@@ -216,6 +244,11 @@ protected boolean processKerberosTokens() {
if (endorsed && !checkEndorsed(tokenResults)) {
return false;
}
+
+ if (!validateSignedEncryptedPolicies(tokenResults)) {
+ return false;
+ }
+
return true;
}
@@ -233,7 +266,7 @@ protected boolean processX509Tokens() {
(BinarySecurity)wser.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
if (binarySecurity instanceof X509Security
|| binarySecurity instanceof PKIPathSecurity) {
- if (endorsed && derived) {
+ if (derived) {
WSSecurityEngineResult resultToStore = processX509DerivedTokenResult(wser);
if (resultToStore != null) {
dktResults.add(resultToStore);
@@ -258,6 +291,35 @@ protected boolean processX509Tokens() {
if (endorsed && !checkEndorsed(tokenResults)) {
return false;
}
+
+ if (!validateSignedEncryptedPolicies(tokenResults)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate (SignedParts|SignedElements|EncryptedParts|EncryptedElements) policies of this
+ * SupportingToken.
+ */
+ private boolean validateSignedEncryptedPolicies(List<WSSecurityEngineResult> tokenResults) {
+ if (!validateSignedEncryptedParts(signedParts, false, signedResults, tokenResults)) {
+ return false;
+ }
+
+ if (!validateSignedEncryptedParts(encryptedParts, true, encryptedResults, tokenResults)) {
+ return false;
+ }
+
+ if (!validateSignedEncryptedElements(signedElements, false, signedResults, tokenResults)) {
+ return false;
+ }
+
+ if (!validateSignedEncryptedElements(encryptedElements, false, encryptedResults, tokenResults)) {
+ return false;
+ }
+
return true;
}
@@ -271,7 +333,7 @@ protected boolean processSCTokens() {
for (WSSecurityEngineResult wser : results) {
Integer actInt = (Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
if (actInt.intValue() == WSConstants.SCT) {
- if (endorsed && derived) {
+ if (derived) {
byte[] secret = (byte[])wser.get(WSSecurityEngineResult.TAG_SECRET);
WSSecurityEngineResult dktResult = getMatchingDerivedKey(secret);
if (dktResult != null) {
@@ -296,6 +358,11 @@ protected boolean processSCTokens() {
if (endorsed && !checkEndorsed(tokenResults)) {
return false;
}
+
+ if (!validateSignedEncryptedPolicies(tokenResults)) {
+ return false;
+ }
+
return true;
}
@@ -417,7 +484,7 @@ private boolean checkTimestampIsSigned(List<WSSecurityEngineResult> tokenResults
if (sl != null) {
for (WSDataRef dataRef : sl) {
if (timestamp == dataRef.getProtectedElement()
- && checkSignature(signedResult, tokenResults)) {
+ && checkSignatureOrEncryptionResult(signedResult, tokenResults)) {
return true;
}
}
@@ -441,7 +508,7 @@ private boolean checkSignatureIsSigned(List<WSSecurityEngineResult> tokenResults
for (WSDataRef dataRef : sl) {
QName signedQName = dataRef.getName();
if (WSSecurityEngine.SIGNATURE.equals(signedQName)
- && checkSignature(signedResult, tokenResults)) {
+ && checkSignatureOrEncryptionResult(signedResult, tokenResults)) {
return true;
}
}
@@ -451,20 +518,20 @@ private boolean checkSignatureIsSigned(List<WSSecurityEngineResult> tokenResults
}
/**
- * Check that a WSSecurityEngineResult corresponding to a signature uses the same
- * signing credential as one of the tokens.
- * @param signatureResult a WSSecurityEngineResult corresponding to a signature
+ * Check that a WSSecurityEngineResult corresponding to a signature or encryption uses the same
+ * signing/encrypting credential as one of the tokens.
+ * @param signatureResult a WSSecurityEngineResult corresponding to a signature or encryption
* @param tokenResult A list of WSSecurityEngineResults corresponding to tokens
* @return
*/
- private boolean checkSignature(
- WSSecurityEngineResult signatureResult,
+ private boolean checkSignatureOrEncryptionResult(
+ WSSecurityEngineResult result,
List<WSSecurityEngineResult> tokenResult
) {
- // See what was used to sign this result
+ // See what was used to sign/encrypt this result
X509Certificate cert =
- (X509Certificate)signatureResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- byte[] secret = (byte[])signatureResult.get(WSSecurityEngineResult.TAG_SECRET);
+ (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+ byte[] secret = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
// Now see if the same credential exists in the tokenResult list
for (WSSecurityEngineResult token : tokenResult) {
@@ -509,6 +576,165 @@ private boolean checkSignature(
return false;
}
+ /**
+ * Validate the SignedParts or EncryptedParts policies
+ */
+ private boolean validateSignedEncryptedParts(
+ SignedEncryptedParts parts,
+ boolean content,
+ List<WSSecurityEngineResult> protResults,
+ List<WSSecurityEngineResult> tokenResults
+ ) {
+ if (parts == null) {
+ return true;
+ }
+
+ if (parts.isBody()) {
+ SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
+ Element soapBody = null;
+ try {
+ soapBody = soapMessage.getSOAPBody();
+ } catch (SOAPException ex) {
+ LOG.log(Level.FINE, ex.getMessage(), ex);
+ return false;
+ }
+
+ if (!checkProtectionResult(soapBody, content, protResults, tokenResults)) {
+ return false;
+ }
+ }
+
+ for (Header h : parts.getHeaders()) {
+ SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
+ Element soapHeader = null;
+ try {
+ soapHeader = soapMessage.getSOAPHeader();
+ } catch (SOAPException ex) {
+ LOG.log(Level.FINE, ex.getMessage(), ex);
+ return false;
+ }
+
+ final List<Element> elements;
+ if (h.getName() == null) {
+ elements = DOMUtils.getChildrenWithNamespace(soapHeader, h.getNamespace());
+ } else {
+ elements = DOMUtils.getChildrenWithName(soapHeader, h.getNamespace(), h.getName());
+ }
+
+ for (Element el : elements) {
+ if (!checkProtectionResult(el, false, protResults, tokenResults)) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Check that an Element is signed or encrypted by one of the token results
+ */
+ private boolean checkProtectionResult(
+ Element elementToProtect,
+ boolean content,
+ List<WSSecurityEngineResult> protResults,
+ List<WSSecurityEngineResult> tokenResults
+ ) {
+ for (WSSecurityEngineResult result : protResults) {
+ List<WSDataRef> dataRefs =
+ CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS));
+ if (dataRefs != null) {
+ for (WSDataRef dataRef : dataRefs) {
+ if (elementToProtect == dataRef.getProtectedElement()
+ && content == dataRef.isContent()
+ && checkSignatureOrEncryptionResult(result, tokenResults)) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Validate SignedElements or EncryptedElements policies
+ */
+ private boolean validateSignedEncryptedElements(
+ SignedEncryptedElements elements,
+ boolean content,
+ List<WSSecurityEngineResult> protResults,
+ List<WSSecurityEngineResult> tokenResults
+ ) {
+ if (elements == null) {
+ return true;
+ }
+
+ Map<String, String> namespaces = elements.getDeclaredNamespaces();
+ List<String> xpaths = elements.getXPathExpressions();
+
+ if (xpaths != null) {
+ SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
+ Element soapEnvelope = soapMessage.getSOAPPart().getDocumentElement();
+
+ for (String xPath : xpaths) {
+ if (!checkXPathResult(soapEnvelope, xPath, namespaces, protResults, tokenResults)) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Check a particular XPath result
+ */
+ private boolean checkXPathResult(
+ Element soapEnvelope,
+ String xPath,
+ Map<String, String> namespaces,
+ List<WSSecurityEngineResult> protResults,
+ List<WSSecurityEngineResult> tokenResults
+ ) {
+ // XPathFactory and XPath are not thread-safe so we must recreate them
+ // each request.
+ final XPathFactory factory = XPathFactory.newInstance();
+ final XPath xpath = factory.newXPath();
+
+ if (namespaces != null) {
+ xpath.setNamespaceContext(new MapNamespaceContext(namespaces));
+ }
+
+ // For each XPath
+ for (String xpathString : Arrays.asList(xPath)) {
+ // Get the matching nodes
+ NodeList list;
+ try {
+ list = (NodeList)xpath.evaluate(
+ xpathString,
+ soapEnvelope,
+ XPathConstants.NODESET);
+ } catch (XPathExpressionException e) {
+ LOG.log(Level.FINE, e.getMessage(), e);
+ return false;
+ }
+
+ // If we found nodes then we need to do the check.
+ if (list.getLength() != 0) {
+ // For each matching element, check for a ref that
+ // covers it.
+ for (int x = 0; x < list.getLength(); x++) {
+ final Element el = (Element)list.item(x);
+
+ if (!checkProtectionResult(el, false, protResults, tokenResults)) {
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
/**
* Return true if a token was signed, false otherwise.
*/
@@ -543,5 +769,33 @@ private boolean isTokenEncrypted(Element token) {
}
return false;
}
+
+ public void setUtResults(List<WSSecurityEngineResult> utResults) {
+ this.utResults = utResults;
+ }
+
+ public void setValidateUsernameToken(boolean validateUsernameToken) {
+ this.validateUsernameToken = validateUsernameToken;
+ }
+
+ public void setTimestamp(Element timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ public void setSignedElements(SignedEncryptedElements signedElements) {
+ this.signedElements = signedElements;
+ }
+
+ public void setEncryptedElements(SignedEncryptedElements encryptedElements) {
+ this.encryptedElements = encryptedElements;
+ }
+
+ public void setSignedParts(SignedEncryptedParts signedParts) {
+ this.signedParts = signedParts;
+ }
+
+ public void setEncryptedParts(SignedEncryptedParts encryptedParts) {
+ this.encryptedParts = encryptedParts;
+ }
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
new file mode 100644
index 00000000000..2388b028fba
--- /dev/null
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
@@ -0,0 +1,122 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.ws.security.wss4j.policyvalidators;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.cxf.message.Message;
+import org.apache.cxf.ws.policy.AssertionInfo;
+import org.apache.cxf.ws.policy.AssertionInfoMap;
+import org.apache.cxf.ws.security.policy.SP12Constants;
+import org.apache.cxf.ws.security.policy.SPConstants;
+import org.apache.cxf.ws.security.policy.model.IssuedToken;
+import org.apache.cxf.ws.security.policy.model.KerberosToken;
+import org.apache.cxf.ws.security.policy.model.SamlToken;
+import org.apache.cxf.ws.security.policy.model.SecurityContextToken;
+import org.apache.cxf.ws.security.policy.model.SupportingToken;
+import org.apache.cxf.ws.security.policy.model.Token;
+import org.apache.cxf.ws.security.policy.model.UsernameToken;
+import org.apache.cxf.ws.security.policy.model.X509Token;
+import org.apache.ws.security.WSSecurityEngineResult;
+
+/**
+ * Validate SupportingToken policies.
+ */
+public class ConcreteSupportingTokenPolicyValidator extends AbstractSupportingTokenPolicyValidator {
+
+ public ConcreteSupportingTokenPolicyValidator() {
+ setSigned(false);
+ }
+
+ public boolean validatePolicy(
+ AssertionInfoMap aim,
+ Message message,
+ List<WSSecurityEngineResult> results,
+ List<WSSecurityEngineResult> signedResults,
+ List<WSSecurityEngineResult> encryptedResults
+ ) {
+ Collection<AssertionInfo> ais = aim.get(SP12Constants.SUPPORTING_TOKENS);
+ if (ais == null || ais.isEmpty()) {
+ return true;
+ }
+
+ setMessage(message);
+ setResults(results);
+ setSignedResults(signedResults);
+ setEncryptedResults(encryptedResults);
+
+ for (AssertionInfo ai : ais) {
+ SupportingToken binding = (SupportingToken)ai.getAssertion();
+ if (SPConstants.SupportTokenType.SUPPORTING_TOKEN_SUPPORTING != binding.getTokenType()) {
+ continue;
+ }
+ ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
+
+ List<Token> tokens = binding.getTokens();
+ for (Token token : tokens) {
+ if (!isTokenRequired(token, message)) {
+ continue;
+ }
+
+ boolean processingFailed = false;
+ if (token instanceof UsernameToken) {
+ if (!processUsernameTokens()) {
+ processingFailed = true;
+ }
+ } else if (token instanceof SamlToken) {
+ if (!processSAMLTokens()) {
+ processingFailed = true;
+ }
+ } else if (token instanceof KerberosToken) {
+ if (!processKerberosTokens()) {
+ processingFailed = true;
+ }
+ } else if (token instanceof X509Token) {
+ if (!processX509Tokens()) {
+ processingFailed = true;
+ }
+ } else if (token instanceof SecurityContextToken) {
+ if (!processSCTokens()) {
+ processingFailed = true;
+ }
+ } else if (!(token instanceof IssuedToken)) {
+ processingFailed = true;
+ }
+
+ if (processingFailed) {
+ ai.setNotAsserted(
+ "The received token does not match the supporting token requirement"
+ );
+ return false;
+ }
+ }
+
+ }
+
+ return true;
+ }
+
+}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
index eca5695b6d8..a022488f78c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
@@ -69,6 +69,11 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
index 5bd7937c047..4b7546659bb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
@@ -71,6 +71,11 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
index 5a7733a9db0..6e5bdad6718 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
@@ -70,7 +70,12 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
-
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
+
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
if (!isTokenRequired(token, message)) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
index 3482ffa3fe8..b83ab6339f0 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
@@ -70,6 +70,11 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
index 8f436fb5f3c..d5121a26852 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
@@ -72,6 +72,11 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
index 01b3a82511d..50a2e654036 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
@@ -70,6 +70,11 @@ public boolean validatePolicy(
continue;
}
ai.setAsserted(true);
+
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
index 461ccb1c22b..741cb7b4d6e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
@@ -70,6 +70,11 @@ public boolean validatePolicy(
}
ai.setAsserted(true);
+ setSignedParts(binding.getSignedParts());
+ setEncryptedParts(binding.getEncryptedParts());
+ setSignedElements(binding.getSignedElements());
+ setEncryptedElements(binding.getEncryptedElements());
+
List<Token> tokens = binding.getTokens();
for (Token token : tokens) {
if (!isTokenRequired(token, message)) {
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
index 3e13da8f9c2..552ae913557 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java
@@ -79,7 +79,7 @@ public void testAsymmetric() throws Exception {
QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricPort");
DoubleItPortType utPort =
service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(25);
@@ -104,7 +104,7 @@ public void testNoSecurity() throws Exception {
QName portQName = new QName(NAMESPACE, "DoubleItNoSecurityPort");
DoubleItPortType utPort =
service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
+ updateAddressPort(utPort, PORT);
try {
utPort.doubleIt(25);
@@ -134,11 +134,70 @@ public void testUsernameToken() throws Exception {
QName portQName = new QName(NAMESPACE, "DoubleItUsernameTokenPort");
DoubleItPortType utPort =
service.getPort(portQName, DoubleItPortType.class);
- updateAddressPort(utPort, PORT2);
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(25);
bus.shutdown(true);
}
+ /**
+ * The client uses a Transport binding policy with a Endorsing Supporting X509 Token. The client does
+ * not sign part of the WSA header though and so the invocation should fail.
+ */
+ @org.junit.Test
+ public void testTransportSupportingSigned() throws Exception {
+
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
+
+ URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
+ Service service = Service.create(wsdl, SERVICE_QNAME);
+ QName portQName = new QName(NAMESPACE, "DoubleItTransportSupportingSignedPort");
+ DoubleItPortType transportPort =
+ service.getPort(portQName, DoubleItPortType.class);
+ updateAddressPort(transportPort, PORT2);
+
+ try {
+ transportPort.doubleIt(25);
+ fail("Failure expected on not signing a wsa header");
+ } catch (javax.xml.ws.soap.SOAPFaultException ex) {
+ // expected
+ }
+ }
+
+ /**
+ * The client uses a Transport binding policy with a Endorsing Supporting X509 Token as well as a
+ * Signed Endorsing UsernameToken. Here the client is trying to trick the Service Provider as
+ * the UsernameToken signs the wsa:To Header, not the X.509 Token.
+ */
+ @org.junit.Test
+ public void testTransportUTSupportingSigned() throws Exception {
+
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = PolicyAlternativeTest.class.getResource("client/client.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
+
+ URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl");
+ Service service = Service.create(wsdl, SERVICE_QNAME);
+ QName portQName = new QName(NAMESPACE, "DoubleItTransportUTSupportingSignedPort");
+ DoubleItPortType transportPort =
+ service.getPort(portQName, DoubleItPortType.class);
+ updateAddressPort(transportPort, PORT2);
+
+ try {
+ transportPort.doubleIt(25);
+ fail("Failure expected on not signing a wsa header");
+ } catch (javax.xml.ws.soap.SOAPFaultException ex) {
+ // expected
+ }
+ }
+
}
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index cd516d0c3c7..4655e647a11 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -466,6 +466,28 @@ public void testAsymmetricSignatureReplay() throws Exception {
bus.shutdown(true);
}
+ @org.junit.Test
+ public void testTransportSupportingSigned() throws Exception {
+ if (!unrestrictedPoliciesInstalled) {
+ return;
+ }
+
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = X509TokenTest.class.getResource("client/client.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
+
+ URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
+ Service service = Service.create(wsdl, SERVICE_QNAME);
+ QName portQName = new QName(NAMESPACE, "DoubleItTransportSupportingSignedPort");
+ DoubleItPortType x509Port =
+ service.getPort(portQName, DoubleItPortType.class);
+ updateAddressPort(x509Port, PORT2);
+ x509Port.doubleIt(25);
+ }
+
private boolean checkUnrestrictedPoliciesInstalled() {
try {
byte[] data = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl
index 6eed27c2088..84825b43ed2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl
@@ -57,6 +57,12 @@
<wsdl:port name="DoubleItNoSecurityPort" binding="tns:DoubleItInlinePolicyBinding">
<soap:address location="http://localhost:9010/DoubleItNoSecurity" />
</wsdl:port>
+ <wsdl:port name="DoubleItTransportSupportingSignedPort" binding="tns:DoubleItInlinePolicyBinding">
+ <soap:address location="https://localhost:9011/DoubleItTransportSupportingSigned" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItTransportUTSupportingSignedPort" binding="tns:DoubleItInlinePolicyBinding">
+ <soap:address location="https://localhost:9011/DoubleItTransportUTSupportingSigned" />
+ </wsdl:port>
</wsdl:service>
</wsdl:definitions>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
index 36d46d80b99..946fc6aae5b 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml
@@ -98,8 +98,51 @@
</jaxws:features>
</jaxws:client>
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort"
+ createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.signature.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ </jaxws:properties>
+ <jaxws:features>
+ <p:policies>
+ <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ URI="#DoubleItTransportSupportingSignedPolicy" />
+ </p:policies>
+ </jaxws:features>
+ </jaxws:client>
+
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTSupportingSignedPort"
+ createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.username" value="alice"/>
+ <entry key="ws-security.signature.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ </jaxws:properties>
+ <jaxws:features>
+ <p:policies>
+ <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ URI="#DoubleItTransportUTSupportingSignedPolicy" />
+ </p:policies>
+ </jaxws:features>
+ </jaxws:client>
+
+ <http:conduit name="https://localhost:.*">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+
- <wsp:Policy wsu:Id="UsernameToken"
+ <wsp:Policy wsu:Id="UsernameToken"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
<wsp:ExactlyOne>
@@ -164,4 +207,107 @@
</wsp:ExactlyOne>
</wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItTransportSupportingSignedPolicy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl" />
+ <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ </wsp:Policy>
+ </sp:X509Token>
+ <sp:SignedParts>
+ <sp:Body/>
+ <!-- <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/> -->
+ </sp:SignedParts>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItTransportUTSupportingSignedPolicy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl" />
+ <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" >
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ </wsp:Policy>
+ </sp:X509Token>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:SignedEndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:UsernameToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy/>
+ </sp:UsernameToken>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+ </sp:SignedParts>
+ </wsp:Policy>
+ </sp:SignedEndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
</beans>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
index b8ee7d5adbe..c0de146c1bc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
@@ -44,8 +44,32 @@
</cxf:features>
</cxf:bus>
+ <!-- -->
+ <!-- Any services listening on port 9009 must use the following -->
+ <!-- Transport Layer Security (TLS) settings -->
+ <!-- -->
+ <httpj:engine-factory id="tls-settings">
+ <httpj:engine port="${testutil.ports.Server.2}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_EXPORT_.*</sec:include>
+ <sec:include>.*_EXPORT1024_.*</sec:include>
+ <sec:include>.*_WITH_DES_.*</sec:include>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:include>.*_WITH_NULL_.*</sec:include>
+ <sec:exclude>.*_DH_anon_.*</sec:exclude>
+ </sec:cipherSuitesFilter>
+ <sec:clientAuthentication want="true" required="false"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+
<jaxws:endpoint id="AsymmetricEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItAsymmetric"
+ address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetric"
serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort"
xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
@@ -68,7 +92,7 @@
</jaxws:endpoint>
<jaxws:endpoint id="NoSecurityEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItNoSecurity"
+ address="http://localhost:${testutil.ports.Server}/DoubleItNoSecurity"
serviceName="s:DoubleItService" endpointName="s:DoubleItNoSecurityPort"
xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
@@ -91,7 +115,7 @@
</jaxws:endpoint>
<jaxws:endpoint id="UsernameTokenEndpoint"
- address="http://localhost:${testutil.ports.Server.2}/DoubleItUsernameToken"
+ address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken"
serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort"
xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
@@ -112,6 +136,54 @@
</jaxws:features>
</jaxws:endpoint>
+
+ <jaxws:endpoint
+ id="TransportSupportingSigned"
+ address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportSupportingSigned"
+ serviceName="s:DoubleItService"
+ endpointName="s:DoubleItTransportSupportingSignedPort"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"
+ depends-on="tls-settings">
+
+ <jaxws:properties>
+ <entry key="ws-security.encryption.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ </jaxws:properties>
+ <jaxws:features>
+ <p:policies>
+ <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ URI="#DoubleItTransportSupportingSignedPolicy" />
+ </p:policies>
+ </jaxws:features>
+
+ </jaxws:endpoint>
+
+ <jaxws:endpoint
+ id="TransportUTSupportingSigned"
+ address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportUTSupportingSigned"
+ serviceName="s:DoubleItService"
+ endpointName="s:DoubleItTransportUTSupportingSignedPort"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"
+ depends-on="tls-settings">
+
+ <jaxws:properties>
+ <entry key="ws-security.encryption.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" />
+ </jaxws:properties>
+ <jaxws:features>
+ <p:policies>
+ <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ URI="#DoubleItTransportSupportingSignedPolicy" />
+ </p:policies>
+ </jaxws:features>
+
+ </jaxws:endpoint>
<wsp:Policy wsu:Id="Combined"
@@ -189,6 +261,52 @@
</wsp:ExactlyOne>
</wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItTransportSupportingSignedPolicy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl" />
+ <sp:TransportBinding xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" >
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ </wsp:Policy>
+ </sp:X509Token>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+ </sp:SignedParts>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
</beans>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
index 0e4c3d2a373..5766ce58285 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
@@ -258,6 +258,23 @@
</wsdl:fault>
</wsdl:operation>
</wsdl:binding>
+ <wsdl:binding name="DoubleItTransportSupportingSignedBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItTransportSupportingSignedPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
<wsdl:service name="DoubleItService">
<wsdl:port name="DoubleItKeyIdentifierPort" binding="tns:DoubleItKeyIdentifierBinding">
@@ -305,6 +322,10 @@
binding="tns:DoubleItTransportSignedEndorsingEncryptedBinding">
<soap:address location="https://localhost:9002/DoubleItX509TransportSignedEndorsingEncrypted" />
</wsdl:port>
+ <wsdl:port name="DoubleItTransportSupportingSignedPort"
+ binding="tns:DoubleItTransportSupportingSignedBinding">
+ <soap:address location="https://localhost:9002/DoubleItX509TransportSupportingSigned" />
+ </wsdl:port>
</wsdl:service>
<wsp:Policy wsu:Id="DoubleItKeyIdentifierPolicy">
@@ -778,6 +799,55 @@
</wsp:ExactlyOne>
</wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItTransportSupportingSignedPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl" />
+ <sp:TransportBinding>
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ </wsp:Policy>
+ </sp:X509Token>
+ <sp:SignedParts>
+ <sp:Body/>
+ <sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+ </sp:SignedParts>
+ <!--
+ <sp:SignedElements>
+ <sp:XPath>//ReplyTo</sp:XPath>
+ </sp:SignedElements>
+ -->
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
<wsp:ExactlyOne>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
index 8c2edc8cb9c..98d8f4e6356 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
@@ -211,6 +211,17 @@
</jaxws:properties>
</jaxws:client>
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort"
+ createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.signature.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ <entry key="ws-security.signature.username" value="alice"/>
+ <entry key="ws-security.callback-handler"
+ value="org.apache.cxf.systest.ws.wssec10.client.KeystorePasswordCallback"/>
+ </jaxws:properties>
+ </jaxws:client>
+
<http:conduit name="https://localhost:.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:trustManagers>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
index 67065301dbc..194744c3294 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
@@ -347,4 +347,21 @@
</jaxws:endpoint>
+ <jaxws:endpoint
+ id="TransportSupportingSigned"
+ address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportSupportingSigned"
+ serviceName="s:DoubleItService"
+ endpointName="s:DoubleItTransportSupportingSignedPort"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
+ depends-on="tls-settings">
+
+ <jaxws:properties>
+ <entry key="ws-security.encryption.properties"
+ value="org/apache/cxf/systest/ws/wssec10/client/alice.properties"/>
+ </jaxws:properties>
+
+ </jaxws:endpoint>
+
</beans>
| 1
|
2bc7332a196a7bfd18ac5c20ed98387d1cef8d08
|
https://github.com/caolan/forms/commit/2bc7332a196a7bfd18ac5c20ed98387d1cef8d08
|
Merge tag 'v1.2.1'
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b428dc9..5fe989a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,29 @@
* [Tests] up to `node` `v7.0`, `v6.9`, `v4.6`; improve test matrix
* [Tests] execute all tests in test directory (#190)
+1.2.1 / 2020-06-08
+===================
+ * [Fix] `validators.email`: allowing comments, prevent catastrophic backtracking (#214)
+ * [Fix] length validators should work with both strings and numbers (#204)
+ * [Fix] ES3: use `array.prototype.{some,every}` instead of `Array#{some,every}`
+ * [Fix] ES3: use `reduce` instead of `Array#reduce`
+ * [Fix] ES3: use `object-keys` instead of `Object.keys`.
+ * [Fix] use `is.array` instead of `Array.isArray`, to continue supporting ES3.
+ * [Deps] update `async`, `formidable`, `is`, `object.assign`, `qs`, `string.prototype.trim`
+ * [eslint] update linting
+ * [meta] add `safe-publish-latest`
+ * [meta] Only apps should have lockfiles
+ * [Dev Deps] update `covert`, `tape`, `testling`
+ * [Tests] add test with only boolean fields
+ * [Tests] add more bizarre but valid email tests
+ * [Tests] improve error messages
+ * [Tests] `validators.email`: refactor tests, add some passing tests
+ * [Tests] add shared eslint config
+ * [Tests] fix key-order based tests (#190)
+ * [Tests] execute all tests in test directory (#190)
+ * [Tests] use `npx aud` instead of `nsp` or `npm audit` with hoops
+ * [Tests] remove `jscs`
+
1.2.0 / 2016-08-25
===================
* [New] Add labelAfterField option when rendering (#183)
| 0
|
7fdd0eb7fad7706abdf718e7ff541c591cacbab0
|
https://github.com/spip/SPIP/commit/7fdd0eb7fad7706abdf718e7ff541c591cacbab0
|
autorisation_phpinfo (!81)
rendre opérationnelle l'autorisation phpinfos et permettre sa surcharge
|
diff --git a/ecrire/inc/autoriser.php b/ecrire/inc/autoriser.php
index 516879d686a..1c2dbac6eff 100644
--- a/ecrire/inc/autoriser.php
+++ b/ecrire/inc/autoriser.php
@@ -1844,6 +1844,6 @@ function autoriser_inscrireauteur_dist($faire, $quoi, $id, $qui, $opt) {
* @param array $opt Options de cette autorisation
* @return bool true s'il a le droit, false sinon
**/
-function autoriser_phpinfos($faire, $type, $id, $qui, $opt) {
+function autoriser_phpinfos_dist($faire, $type, $id, $qui, $opt) {
return autoriser('webmestre');
}
diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php
index 35dd95f9eab..27b3c30eda0 100644
--- a/ecrire/inc/utils.php
+++ b/ecrire/inc/utils.php
@@ -3128,7 +3128,7 @@ function aider($aide = '', $distante = false) {
function exec_info_dist() {
include_spip('inc/autoriser');
- if (autoriser('webmestre')) {
+ if (autoriser('phpinfos')) {
$cookies_masques = ['spip_session', 'PHPSESSID'];
$cookies_backup = [];
foreach ($cookies_masques as $k) {
@@ -3644,4 +3644,4 @@ function spip_sanitize_classname($classes) {
return array_map('spip_sanitize_classname', $classes);
}
return preg_replace("/[^ 0-9a-z_\-+@]/i", "", $classes);
-}
\ No newline at end of file
+}
| 0
|
437b273761adedcbd880f714bfa44afeec186a31
|
https://github.com/the-tcpdump-group/libpcap/commit/437b273761adedcbd880f714bfa44afeec186a31
|
Don't crash if crypt() fails.
It can fail, so make sure it doesn't before comparing its result with
the password.
This addresses Include Security issue F12: [libpcap] Remote Packet
Capture Daemon Null Pointer Dereference Denial of Service.
|
diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
index 9816328932..c9b44aafb5 100644
--- a/rpcapd/daemon.c
+++ b/rpcapd/daemon.c
@@ -1222,6 +1222,7 @@ daemon_AuthUserPwd(char *username, char *password, char *errbuf)
#ifdef HAVE_GETSPNAM
struct spwd *usersp;
#endif
+ char *crypt_password;
// This call is needed to get the uid
if ((user = getpwnam(username)) == NULL)
@@ -1252,7 +1253,13 @@ daemon_AuthUserPwd(char *username, char *password, char *errbuf)
user_password = user->pw_passwd;
#endif
- if (strcmp(user_password, (char *) crypt(password, user_password)) != 0)
+ crypt_password = crypt(password, user_password);
+ if (crypt_password == NULL)
+ {
+ pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Authentication failed");
+ return -1;
+ }
+ if (strcmp(user_password, crypt_password) != 0)
{
pcap_snprintf(errbuf, PCAP_ERRBUF_SIZE, "Authentication failed: user name or password incorrect");
return -1;
| 1
|
f06e569c0dd291897fad85d573d799f0dfaa60ca
|
https://github.com/GNOME/libgsf/commit/f06e569c0dd291897fad85d573d799f0dfaa60ca
|
Introduce GValueArray-free alternative to gsf_value_get_docprop_varray()
Signed-off-by: Marc-André Lureau <[email protected]>
|
diff --git a/gsf/gsf-docprop-vector.c b/gsf/gsf-docprop-vector.c
index e84fb956..1571cdac 100644
--- a/gsf/gsf-docprop-vector.c
+++ b/gsf/gsf-docprop-vector.c
@@ -23,9 +23,13 @@
#include <gsf/gsf-docprop-vector.h>
#include <gsf/gsf.h>
+/* TODO: Drop GValueArray when breaking API */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
struct _GsfDocPropVector {
GObject parent;
+ GArray *ga;
GValueArray *gva;
};
typedef GObjectClass GsfDocPropVectorClass;
@@ -43,6 +47,22 @@ gsf_value_get_docprop_varray (GValue const *value)
return v ? v->gva : NULL;
}
+/**
+ * gsf_value_get_docprop_array:
+ * @value: A GValue of type #GsfDocPropVector.
+ *
+ * This function returns the array of values inside #GsfDocPropVector or NULL.
+ * No additional references are created.
+ *
+ * Returns: (transfer none) (element-type GValue): A #GArray of #GValue
+ **/
+GArray *
+gsf_value_get_docprop_array (GValue const *value)
+{
+ GsfDocPropVector *v = gsf_value_get_docprop_vector (value);
+ return v ? v->ga : NULL;
+}
+
/**
* gsf_value_get_docprop_vector:
* @value: A GValue of type #GsfDocPropVector.
@@ -73,8 +93,15 @@ gsf_docprop_vector_append (GsfDocPropVector *vector, GValue *value)
g_return_if_fail (vector != NULL);
g_return_if_fail (value != NULL);
- if (G_IS_VALUE (value))
+ if (G_IS_VALUE (value)) {
+ GValue val = G_VALUE_INIT;
+
+ g_value_init (&val, G_VALUE_TYPE (value));
+ g_value_copy (value, &val);
+ g_array_append_vals (vector->ga, &val, 1);
+
vector->gva = g_value_array_append (vector->gva, value);
+ }
}
/**
@@ -95,16 +122,16 @@ gsf_docprop_vector_as_string (GsfDocPropVector const *vector)
guint num_values;
g_return_val_if_fail (vector != NULL, NULL);
- g_return_val_if_fail (vector->gva != NULL, NULL);
+ g_return_val_if_fail (vector->ga != NULL, NULL);
rstring = g_new0 (gchar, 1);
- num_values = vector->gva->n_values;
+ num_values = vector->ga->len;
for (i = 0; i < num_values; i++) {
char *str;
GValue *v;
- v = g_value_array_get_nth (vector->gva, i);
+ v = &g_array_index (vector->ga, GValue, i);
str = g_strdup_value_contents (v);
rstring = g_strconcat (rstring, str, ",", NULL);
g_free (str);
@@ -121,6 +148,7 @@ gsf_docprop_vector_finalize (GObject *obj)
g_value_array_free (vector->gva);
vector->gva = NULL;
}
+ g_clear_pointer(&vector->ga, g_array_unref);
parent_class->finalize (obj);
}
@@ -134,6 +162,8 @@ gsf_docprop_vector_class_init (GObjectClass *gobject_class)
static void
gsf_docprop_vector_init (GsfDocPropVector *vector)
{
+ vector->ga = g_array_sized_new (FALSE, TRUE, sizeof (GValue), 0);
+ g_array_set_clear_func (vector->ga, (GDestroyNotify) g_value_unset);
vector->gva = g_value_array_new (0);
}
@@ -154,3 +184,4 @@ gsf_docprop_vector_new (void)
return g_object_new (GSF_DOCPROP_VECTOR_TYPE, NULL);
}
+G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/gsf/gsf-docprop-vector.h b/gsf/gsf-docprop-vector.h
index 027b32e7..69c1952b 100644
--- a/gsf/gsf-docprop-vector.h
+++ b/gsf/gsf-docprop-vector.h
@@ -40,8 +40,12 @@ gchar *gsf_docprop_vector_as_string (GsfDocPropVector const *vector);
#define VAL_IS_GSF_DOCPROP_VECTOR(v) (G_TYPE_CHECK_VALUE_TYPE((v), GSF_DOCPROP_VECTOR_TYPE))
GsfDocPropVector *gsf_value_get_docprop_vector (GValue const *value);
+
+G_DEPRECATED_FOR(gsf_value_get_docprop_array)
GValueArray *gsf_value_get_docprop_varray (GValue const *value);
+GArray *gsf_value_get_docprop_array (GValue const *value);
+
G_END_DECLS
#endif /* GSF_DOCPROP_VECTOR_H */
| 0
|
d23fbbd6c8434169967cf8bd2c5a4a0b569c352a
|
https://github.com/LimeSurvey/LimeSurvey/commit/d23fbbd6c8434169967cf8bd2c5a4a0b569c352a
|
Fixed issue: XSS reflection in CPDB and global settings
|
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
index e6cef23fec7..995b5e08ab5 100644
--- a/application/controllers/admin/participantsaction.php
+++ b/application/controllers/admin/participantsaction.php
@@ -835,7 +835,7 @@ function getParticipants_json($search = null)
*/
function getAttribute_json()
{
- $iParticipantId = Yii::app()->request->getQuery('pid');
+ $iParticipantId = strip_tags(Yii::app()->request->getQuery('pid'));
$records = ParticipantAttributeName::model()->getParticipantVisibleAttribute($iParticipantId);
$records = subval_sort($records, "attribute_name", "asc");
diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php
index 52390ab7ed6..a674ec561ae 100644
--- a/application/views/admin/globalSettings_view.php
+++ b/application/views/admin/globalSettings_view.php
@@ -361,7 +361,7 @@
<?php $thisforce_ssl = getGlobalSetting('force_ssl');
$opt_force_ssl_on = $opt_force_ssl_off = $opt_force_ssl_neither = '';
- $warning_force_ssl = sprintf($clang->gT('Warning: Before turning on HTTPS,%s check if this link works.%s'),'<a href="https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'" title="'. $clang->gT('Test if your server has SSL enabled by clicking on this link.').'">','</a>')
+ $warning_force_ssl = sprintf($clang->gT('Warning: Before turning on HTTPS,%s check if this link works.%s'),'<a href="https://'.$_SERVER['HTTP_HOST'].$this->createUrl("admin/globalsettings/sa").'" title="'. $clang->gT('Test if your server has SSL enabled by clicking on this link.').'">','</a>')
.'<br/> '
. $clang->gT("If the link does not work and you turn on HTTPS, LimeSurvey will break and you won't be able to access it.");
switch($thisforce_ssl)
| 1
|
d7e2e8d19e2b9ef2516a860b59d23be1cc31ee99
|
https://github.com/stevegraham/slanger/commit/d7e2e8d19e2b9ef2516a860b59d23be1cc31ee99
|
fix missing constant error
|
diff --git a/lib/slanger/handler.rb b/lib/slanger/handler.rb
index 41c2c38..f294c34 100644
--- a/lib/slanger/handler.rb
+++ b/lib/slanger/handler.rb
@@ -38,7 +38,7 @@ def onmessage(msg)
send event, msg
end
- rescue Oj::ParserError
+ rescue JSON::ParserError
error({ code: 5001, message: "Invalid JSON" })
rescue Exception => e
error({ code: 500, message: "#{e.message}\n #{e.backtrace.join "\n"}" })
| 0
|
1a908ce13ea7b585d2e7ac315e3ef3e4bc8db560
|
https://github.com/esnet/iperf/commit/1a908ce13ea7b585d2e7ac315e3ef3e4bc8db560
|
feat: Add a --timestamps flag to prepend a timestamp per output line. (#1028)
This flag takes an optional argument, which is a format specification to strftime(3)...this allows for custom timestamp formats. Based on a suggested implementation by @davidBar-On. Towards #909.
|
diff --git a/src/iperf.h b/src/iperf.h
index 3e0edb660..6201a0759 100644
--- a/src/iperf.h
+++ b/src/iperf.h
@@ -1,5 +1,5 @@
/*
- * iperf, Copyright (c) 2014-2019, The Regents of the University of
+ * iperf, Copyright (c) 2014-2020, The Regents of the University of
* California, through Lawrence Berkeley National Laboratory (subject
* to receipt of any required approvals from the U.S. Dept. of
* Energy). All rights reserved.
@@ -301,6 +301,8 @@ struct iperf_test
int forceflush; /* --forceflush - flushing output at every interval */
int multisend;
int repeating_payload; /* --repeating-payload */
+ int timestamps; /* --timestamps */
+ char *timestamp_format;
char *json_output_string; /* rendered JSON output if json_output is set */
/* Select related parameters */
@@ -393,6 +395,8 @@ struct iperf_test
#define MAX_MSS (9 * 1024)
#define MAX_STREAMS 128
+#define TIMESTAMP_FORMAT "%c "
+
extern int gerror; /* error value from getaddrinfo(3), for use in internal error handling */
#endif /* !__IPERF_H */
diff --git a/src/iperf3.1 b/src/iperf3.1
index aad699749..97d66ed1b 100644
--- a/src/iperf3.1
+++ b/src/iperf3.1
@@ -153,6 +153,14 @@ send output to a log file.
force flushing output at every interval.
Used to avoid buffering when sending output to pipe.
.TP
+.BR --timestamps " [\fIformat\fR]"
+prepend a timestamp at the start of each output line.
+By default, timestamps have the format emitted by
+.BR ctime ( 1 ).
+Optionally, a format specification can be passed to customize the
+timestamps, see
+.BR strftime ( 3 ).
+.TP
.BR -d ", " --debug " "
emit debugging output.
Primarily (perhaps exclusively) of use to developers.
diff --git a/src/iperf_api.c b/src/iperf_api.c
index 16e0b954c..ad2453b91 100644
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -260,6 +260,18 @@ iperf_get_test_num_streams(struct iperf_test *ipt)
return ipt->num_streams;
}
+int
+iperf_get_test_timestamps(struct iperf_test *ipt)
+{
+ return ipt->timestamps;
+}
+
+const char *
+iperf_get_test_timestamp_format(struct iperf_test *ipt)
+{
+ return ipt->timestamp_format;
+}
+
int
iperf_get_test_repeating_payload(struct iperf_test *ipt)
{
@@ -503,6 +515,18 @@ iperf_set_test_repeating_payload(struct iperf_test *ipt, int repeating_payload)
ipt->repeating_payload = repeating_payload;
}
+void
+iperf_set_test_timestamps(struct iperf_test *ipt, int timestamps)
+{
+ ipt->timestamps = timestamps;
+}
+
+void
+iperf_set_test_timestamp_format(struct iperf_test *ipt, const char *tf)
+{
+ ipt->timestamp_format = strdup(tf);
+}
+
static void
check_sender_has_retransmits(struct iperf_test *ipt)
{
@@ -878,6 +902,7 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
{"omit", required_argument, NULL, 'O'},
{"file", required_argument, NULL, 'F'},
{"repeating-payload", no_argument, NULL, OPT_REPEATING_PAYLOAD},
+ {"timestamps", optional_argument, NULL, OPT_TIMESTAMPS},
#if defined(HAVE_CPU_AFFINITY)
{"affinity", required_argument, NULL, 'A'},
#endif /* HAVE_CPU_AFFINITY */
@@ -1202,6 +1227,15 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
test->repeating_payload = 1;
client_flag = 1;
break;
+ case OPT_TIMESTAMPS:
+ iperf_set_test_timestamps(test, 1);
+ if (optarg) {
+ iperf_set_test_timestamp_format(test, optarg);
+ }
+ else {
+ iperf_set_test_timestamp_format(test, TIMESTAMP_FORMAT);
+ }
+ break;
case 'O':
test->omit = atoi(optarg);
if (test->omit < 0 || test->omit > 60) {
@@ -2610,6 +2644,8 @@ iperf_free_test(struct iperf_test *test)
free(test->congestion_used);
if (test->remote_congestion_used)
free(test->remote_congestion_used);
+ if (test->timestamp_format)
+ free(test->timestamp_format);
if (test->omit_timer != NULL)
tmr_cancel(test->omit_timer);
if (test->timer != NULL)
@@ -4269,11 +4305,24 @@ iperf_clearaffinity(struct iperf_test *test)
#endif /* neither HAVE_SCHED_SETAFFINITY nor HAVE_CPUSET_SETAFFINITY nor HAVE_SETPROCESSAFFINITYMASK */
}
+char iperf_timestr[100];
+
int
iperf_printf(struct iperf_test *test, const char* format, ...)
{
va_list argp;
int r = -1;
+ time_t now;
+ struct tm *ltm = NULL;
+ char *ct = NULL;
+
+ /* Timestamp if requested */
+ if (iperf_get_test_timestamps(test)) {
+ time(&now);
+ ltm = localtime(&now);
+ strftime(iperf_timestr, sizeof(iperf_timestr), iperf_get_test_timestamp_format(test), ltm);
+ ct = iperf_timestr;
+ }
/*
* There are roughly two use cases here. If we're the client,
@@ -4288,6 +4337,9 @@ iperf_printf(struct iperf_test *test, const char* format, ...)
* to be buffered up anyway.
*/
if (test->role == 'c') {
+ if (ct) {
+ fprintf(test->outfile, "%s", ct);
+ }
if (test->title)
fprintf(test->outfile, "%s: ", test->title);
va_start(argp, format);
@@ -4296,8 +4348,12 @@ iperf_printf(struct iperf_test *test, const char* format, ...)
}
else if (test->role == 's') {
char linebuffer[1024];
+ int i = 0;
+ if (ct) {
+ i = sprintf(linebuffer, "%s", ct);
+ }
va_start(argp, format);
- r = vsnprintf(linebuffer, sizeof(linebuffer), format, argp);
+ r = vsnprintf(linebuffer + i, sizeof(linebuffer), format, argp);
va_end(argp);
fprintf(test->outfile, "%s", linebuffer);
diff --git a/src/iperf_api.h b/src/iperf_api.h
index 443f12f51..63228d9f6 100644
--- a/src/iperf_api.h
+++ b/src/iperf_api.h
@@ -76,6 +76,7 @@ typedef uint64_t iperf_size_t;
#define OPT_EXTRA_DATA 19
#define OPT_BIDIRECTIONAL 20
#define OPT_SERVER_BITRATE_LIMIT 21
+#define OPT_TIMESTAMPS 22
/* states */
#define TEST_START 1
@@ -116,6 +117,8 @@ double iperf_get_test_reporter_interval( struct iperf_test* ipt );
double iperf_get_test_stats_interval( struct iperf_test* ipt );
int iperf_get_test_num_streams( struct iperf_test* ipt );
int iperf_get_test_repeating_payload( struct iperf_test* ipt );
+int iperf_get_test_timestamps( struct iperf_test* ipt );
+const char* iperf_get_test_timestamp_format( struct iperf_test* ipt );
int iperf_get_test_server_port( struct iperf_test* ipt );
char* iperf_get_test_server_hostname( struct iperf_test* ipt );
char* iperf_get_test_template( struct iperf_test* ipt );
@@ -152,6 +155,8 @@ void iperf_set_test_server_port( struct iperf_test* ipt, int server_port );
void iperf_set_test_socket_bufsize( struct iperf_test* ipt, int socket_bufsize );
void iperf_set_test_num_streams( struct iperf_test* ipt, int num_streams );
void iperf_set_test_repeating_payload( struct iperf_test* ipt, int repeating_payload );
+void iperf_set_test_timestamps( struct iperf_test* ipt, int timestamps );
+void iperf_set_test_timestamp_format( struct iperf_test*, const char *tf );
void iperf_set_test_role( struct iperf_test* ipt, char role );
void iperf_set_test_server_hostname( struct iperf_test* ipt, const char* server_hostname );
void iperf_set_test_template( struct iperf_test *ipt, const char *tmp_template );
diff --git a/src/iperf_error.c b/src/iperf_error.c
index 51445d53c..b08054056 100644
--- a/src/iperf_error.c
+++ b/src/iperf_error.c
@@ -35,12 +35,25 @@
int gerror;
+char iperf_timestrerr[100];
+
/* Do a printf to stderr. */
void
iperf_err(struct iperf_test *test, const char *format, ...)
{
va_list argp;
char str[1000];
+ time_t now;
+ struct tm *ltm = NULL;
+ char *ct = NULL;
+
+ /* Timestamp if requested */
+ if (test != NULL && test->timestamps) {
+ time(&now);
+ ltm = localtime(&now);
+ strftime(iperf_timestrerr, sizeof(iperf_timestrerr), test->timestamp_format, ltm);
+ ct = iperf_timestrerr;
+ }
va_start(argp, format);
vsnprintf(str, sizeof(str), format, argp);
@@ -48,9 +61,15 @@ iperf_err(struct iperf_test *test, const char *format, ...)
cJSON_AddStringToObject(test->json_top, "error", str);
else
if (test && test->outfile && test->outfile != stdout) {
+ if (ct) {
+ fprintf(test->outfile, "%s", ct);
+ }
fprintf(test->outfile, "iperf3: %s\n", str);
}
else {
+ if (ct) {
+ fprintf(stderr, "%s", ct);
+ }
fprintf(stderr, "iperf3: %s\n", str);
}
va_end(argp);
@@ -62,6 +81,17 @@ iperf_errexit(struct iperf_test *test, const char *format, ...)
{
va_list argp;
char str[1000];
+ time_t now;
+ struct tm *ltm = NULL;
+ char *ct = NULL;
+
+ /* Timestamp if requested */
+ if (test != NULL && test->timestamps) {
+ time(&now);
+ ltm = localtime(&now);
+ strftime(iperf_timestrerr, sizeof(iperf_timestrerr), "%c ", ltm);
+ ct = iperf_timestrerr;
+ }
va_start(argp, format);
vsnprintf(str, sizeof(str), format, argp);
@@ -70,9 +100,15 @@ iperf_errexit(struct iperf_test *test, const char *format, ...)
iperf_json_finish(test);
} else
if (test && test->outfile && test->outfile != stdout) {
+ if (ct) {
+ fprintf(test->outfile, "%s", ct);
+ }
fprintf(test->outfile, "iperf3: %s\n", str);
}
else {
+ if (ct) {
+ fprintf(stderr, "%s", ct);
+ }
fprintf(stderr, "iperf3: %s\n", str);
}
va_end(argp);
diff --git a/src/iperf_locale.c b/src/iperf_locale.c
index 8d6dd0bee..d5a5354bb 100644
--- a/src/iperf_locale.c
+++ b/src/iperf_locale.c
@@ -109,6 +109,9 @@ const char usage_longstr[] = "Usage: iperf3 [-s|-c host] [options]\n"
" -J, --json output in JSON format\n"
" --logfile f send output to a log file\n"
" --forceflush force flushing output at every interval\n"
+ " --timestamps <format> emit a timestamp at the start of each output line\n"
+ " (using optional format string as per strftime(3))\n"
+
" -d, --debug emit debugging output\n"
" -v, --version show version information and quit\n"
" -h, --help show this message and quit\n"
| 0
|
e6b3400c71f7ed27a2c986fa5bb38136cb18b257
|
https://github.com/droolsjbpm/kie-wb-distributions/commit/e6b3400c71f7ed27a2c986fa5bb38136cb18b257
|
updated to 7.45.0-SNAPSHOT
|
diff --git a/business-central-parent/add-ons-distribution/pom.xml b/business-central-parent/add-ons-distribution/pom.xml
index cf818c38f1..c58c9e8212 100644
--- a/business-central-parent/add-ons-distribution/pom.xml
+++ b/business-central-parent/add-ons-distribution/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>business-central-parent</artifactId>
<groupId>org.kie</groupId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>add-ons-distribution</artifactId>
diff --git a/business-central-parent/business-central-deployment-validation/pom.xml b/business-central-parent/business-central-deployment-validation/pom.xml
index d7dda71ec3..5c6a840444 100644
--- a/business-central-parent/business-central-deployment-validation/pom.xml
+++ b/business-central-parent/business-central-deployment-validation/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-deployment-validation</artifactId>
<name>Business Central Deployment Validation</name>
diff --git a/business-central-parent/business-central-distribution-wars/business-central/pom.xml b/business-central-parent/business-central-distribution-wars/business-central/pom.xml
index 123f017349..e3f30cbcc2 100644
--- a/business-central-parent/business-central-distribution-wars/business-central/pom.xml
+++ b/business-central-parent/business-central-distribution-wars/business-central/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-distribution-wars</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central</artifactId>
diff --git a/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml b/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml
index fb619212fa..f51e891fa0 100644
--- a/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml
+++ b/business-central-parent/business-central-distribution-wars/business-monitoring/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-distribution-wars</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-monitoring</artifactId>
diff --git a/business-central-parent/business-central-distribution-wars/pom.xml b/business-central-parent/business-central-distribution-wars/pom.xml
index 4029bccde2..d282c00c8f 100644
--- a/business-central-parent/business-central-distribution-wars/pom.xml
+++ b/business-central-parent/business-central-distribution-wars/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-distribution-wars</artifactId>
diff --git a/business-central-parent/business-central-home-page-community/pom.xml b/business-central-parent/business-central-home-page-community/pom.xml
index 04800150a5..803c29c944 100644
--- a/business-central-parent/business-central-home-page-community/pom.xml
+++ b/business-central-parent/business-central-home-page-community/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-home-page-community</artifactId>
diff --git a/business-central-parent/business-central-home-page-product/pom.xml b/business-central-parent/business-central-home-page-product/pom.xml
index ea7efa2caa..3df7d7456a 100644
--- a/business-central-parent/business-central-home-page-product/pom.xml
+++ b/business-central-parent/business-central-home-page-product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-home-page-product</artifactId>
diff --git a/business-central-parent/business-central-theme/business-central-theme-community/pom.xml b/business-central-parent/business-central-theme/business-central-theme-community/pom.xml
index d1e3d35f64..974e9b0abe 100644
--- a/business-central-parent/business-central-theme/business-central-theme-community/pom.xml
+++ b/business-central-parent/business-central-theme/business-central-theme-community/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-theme</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-theme-community</artifactId>
diff --git a/business-central-parent/business-central-theme/business-central-theme-product/pom.xml b/business-central-parent/business-central-theme/business-central-theme-product/pom.xml
index 2638de5844..40480829fc 100644
--- a/business-central-parent/business-central-theme/business-central-theme-product/pom.xml
+++ b/business-central-parent/business-central-theme/business-central-theme-product/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-theme</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-theme-product</artifactId>
diff --git a/business-central-parent/business-central-theme/pom.xml b/business-central-parent/business-central-theme/pom.xml
index e4324b6f31..4829123715 100644
--- a/business-central-parent/business-central-theme/pom.xml
+++ b/business-central-parent/business-central-theme/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-theme</artifactId>
diff --git a/business-central-parent/business-central-webapp-common/pom.xml b/business-central-parent/business-central-webapp-common/pom.xml
index e3849d4c31..b626af1658 100644
--- a/business-central-parent/business-central-webapp-common/pom.xml
+++ b/business-central-parent/business-central-webapp-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>business-central-parent</artifactId>
<groupId>org.kie</groupId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/business-central-parent/business-central-webapp/pom.xml b/business-central-parent/business-central-webapp/pom.xml
index 78bc66b4e8..6e8e6fdca3 100644
--- a/business-central-parent/business-central-webapp/pom.xml
+++ b/business-central-parent/business-central-webapp/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-webapp</artifactId>
diff --git a/business-central-parent/business-monitoring-webapp/pom.xml b/business-central-parent/business-monitoring-webapp/pom.xml
index 034acc4a1f..21f95f7b40 100644
--- a/business-central-parent/business-monitoring-webapp/pom.xml
+++ b/business-central-parent/business-monitoring-webapp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-monitoring-webapp</artifactId>
diff --git a/business-central-parent/jbpm-server-distribution/pom.xml b/business-central-parent/jbpm-server-distribution/pom.xml
index 6ab1fd5f8e..bd56182aed 100644
--- a/business-central-parent/jbpm-server-distribution/pom.xml
+++ b/business-central-parent/jbpm-server-distribution/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>jbpm-server-distribution</artifactId>
<packaging>pom</packaging>
diff --git a/business-central-parent/pom.xml b/business-central-parent/pom.xml
index 346d5339c0..e736d60274 100644
--- a/business-central-parent/pom.xml
+++ b/business-central-parent/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-wb-distributions</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-parent</artifactId>
diff --git a/business-central-tests/business-central-tests-gui/pom.xml b/business-central-tests/business-central-tests-gui/pom.xml
index b2f5b5c05c..26a6be91cd 100644
--- a/business-central-tests/business-central-tests-gui/pom.xml
+++ b/business-central-tests/business-central-tests-gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-tests</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>business-central-tests-gui</artifactId>
diff --git a/business-central-tests/business-central-tests-rest/pom.xml b/business-central-tests/business-central-tests-rest/pom.xml
index 63f231a09a..b77f787beb 100644
--- a/business-central-tests/business-central-tests-rest/pom.xml
+++ b/business-central-tests/business-central-tests-rest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>business-central-tests</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/business-central-tests/pom.xml b/business-central-tests/pom.xml
index cecd8cf617..8abe56313e 100644
--- a/business-central-tests/pom.xml
+++ b/business-central-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-wb-distributions</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index c14a428a06..9ec3a01dab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.kie</groupId>
<artifactId>kie-parent</artifactId>
- <version>7.44.0-SNAPSHOT</version>
+ <version>7.45.0-SNAPSHOT</version>
</parent>
<artifactId>kie-wb-distributions</artifactId>
| 0
|
696ec886a23dae880cf12e34e1fe09c5df8fe94
|
https://github.com/x-stream/xstream/commit/696ec886a23dae880cf12e34e1fe09c5df8fe94
|
Fix XXE vulnerability for JDom parsers.
|
diff --git a/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java b/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java
index b582756e..0c672dc1 100644
--- a/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java
+++ b/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java
@@ -64,7 +64,7 @@ public DomDriver(String encoding, NameCoder nameCoder) {
this.encoding = encoding;
documentBuilderFactory = DocumentBuilderFactory.newInstance();
try {
- documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false);
+ documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
} catch (final ParserConfigurationException e) {
throw new StreamException(e);
}
diff --git a/xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java b/xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java
index 876630e9..f45e00ed 100644
--- a/xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java
+++ b/xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java
@@ -47,8 +47,8 @@ public JDom2Driver(NameCoder nameCoder) {
public HierarchicalStreamReader createReader(Reader reader) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(reader);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(reader);
return new JDom2Reader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -59,8 +59,8 @@ public HierarchicalStreamReader createReader(Reader reader) {
public HierarchicalStreamReader createReader(InputStream in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDom2Reader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -71,8 +71,8 @@ public HierarchicalStreamReader createReader(InputStream in) {
public HierarchicalStreamReader createReader(URL in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDom2Reader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -83,8 +83,8 @@ public HierarchicalStreamReader createReader(URL in) {
public HierarchicalStreamReader createReader(File in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDom2Reader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -100,5 +100,17 @@ public HierarchicalStreamWriter createWriter(Writer out) {
public HierarchicalStreamWriter createWriter(OutputStream out) {
return new PrettyPrintWriter(new OutputStreamWriter(out));
}
+
+ /**
+ * Create and initialize the SAX builder.
+ *
+ * @return the SAX builder instance.
+ * @since upcoming
+ */
+ protected SAXBuilder createBuilder() {
+ final SAXBuilder builder = new SAXBuilder();
+ builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ return builder;
+ }
}
diff --git a/xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java b/xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java
index 6bc3255f..25d927dc 100644
--- a/xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java
+++ b/xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java
@@ -55,8 +55,8 @@ public JDomDriver(XmlFriendlyReplacer replacer) {
public HierarchicalStreamReader createReader(Reader reader) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(reader);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(reader);
return new JDomReader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -67,8 +67,8 @@ public HierarchicalStreamReader createReader(Reader reader) {
public HierarchicalStreamReader createReader(InputStream in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDomReader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -79,8 +79,8 @@ public HierarchicalStreamReader createReader(InputStream in) {
public HierarchicalStreamReader createReader(URL in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDomReader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -91,8 +91,8 @@ public HierarchicalStreamReader createReader(URL in) {
public HierarchicalStreamReader createReader(File in) {
try {
- SAXBuilder builder = new SAXBuilder();
- Document document = builder.build(in);
+ final SAXBuilder builder = createBuilder();
+ final Document document = builder.build(in);
return new JDomReader(document, getNameCoder());
} catch (IOException e) {
throw new StreamException(e);
@@ -109,5 +109,17 @@ public HierarchicalStreamWriter createWriter(OutputStream out) {
return new PrettyPrintWriter(new OutputStreamWriter(out));
}
+ /**
+ * Create and initialize the SAX builder.
+ *
+ * @return the SAX builder instance.
+ * @since upcoming
+ */
+ protected SAXBuilder createBuilder() {
+ final SAXBuilder builder = new SAXBuilder();
+ builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ return builder;
+ }
+
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java
index 6595ff45..f9d1e194 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java
@@ -29,7 +29,6 @@ protected HierarchicalStreamReader createReader(String xml) throws Exception {
@Override
public void testIsXXEVulnerable() throws Exception {
// Implementation ignores XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES
- todoIsXXEVulnerable();
}
public void todoIsXXEVulnerable() throws Exception {
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/DomReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/DomReaderTest.java
index a6e8bb9e..f03c8e4c 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/DomReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/DomReaderTest.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2004, 2005 Joe Walnes.
- * Copyright (C) 2006, 2007 XStream Committers.
+ * Copyright (C) 2006, 2007, 2015 XStream Committers.
* All rights reserved.
*
* The software in this package is published under the terms of the BSD
@@ -90,8 +90,8 @@ public void testIsXXEVulnerable() throws Exception {
super.testIsXXEVulnerable();
fail("Thrown " + XStreamException.class.getName() + " expected");
} catch (final XStreamException e) {
- final String message = e.getMessage().toLowerCase();
- if (message.contains("Package")) {
+ final String message = e.getMessage();
+ if (!message.contains("DOCTYPE")) {
throw e;
}
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/JDom2ReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/JDom2ReaderTest.java
index 3b9def70..1ad7812b 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/JDom2ReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/JDom2ReaderTest.java
@@ -15,7 +15,6 @@
import org.jdom2.Document;
import org.jdom2.Element;
-import org.jdom2.input.JDOMParseException;
import org.jdom2.input.SAXBuilder;
import java.io.StringReader;
@@ -49,10 +48,10 @@ public void testCanReadFromElementOfLargerDocument() throws Exception {
public void testIsXXEVulnerable() throws Exception {
try {
super.testIsXXEVulnerable();
- fail("Thrown " + JDOMParseException.class.getName() + " expected");
- } catch (final JDOMParseException e) {
+ fail("Thrown " + XStreamException.class.getName() + " expected");
+ } catch (final XStreamException e) {
final String message = e.getMessage();
- if (message.contains("Package")) {
+ if (!message.contains("DOCTYPE")) {
throw e;
}
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/JDomReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/JDomReaderTest.java
index 36009976..c8e4cff9 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/JDomReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/JDomReaderTest.java
@@ -16,7 +16,6 @@
import org.jdom.Document;
import org.jdom.Element;
-import org.jdom.input.JDOMParseException;
import org.jdom.input.SAXBuilder;
import java.io.StringReader;
@@ -50,10 +49,10 @@ public void testCanReadFromElementOfLargerDocument() throws Exception {
public void testIsXXEVulnerable() throws Exception {
try {
super.testIsXXEVulnerable();
- fail("Thrown " + JDOMParseException.class.getName() + " expected");
- } catch (final JDOMParseException e) {
+ fail("Thrown " + XStreamException.class.getName() + " expected");
+ } catch (final XStreamException e) {
final String message = e.getMessage();
- if (message.contains("Package")) {
+ if (!message.contains("DOCTYPE")) {
throw e;
}
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/SjsxpReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/SjsxpReaderTest.java
index 15c7b8e3..2ba70c79 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/SjsxpReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/SjsxpReaderTest.java
@@ -48,17 +48,5 @@ protected HierarchicalStreamReader createReader(String xml) throws Exception {
return driver.createReader(new StringReader(xml));
}
- @Override
- public void testIsXXEVulnerable() throws Exception {
- try {
- super.testIsXXEVulnerable();
- } catch (final XStreamException e) {
- final String message = e.getMessage();
- if (message.contains("ParseError") && message.contains("[1,1]")) {
- throw e;
- }
- }
- }
-
// inherits tests from superclass
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/StandardStaxReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/StandardStaxReaderTest.java
index e1e64d74..bda0e66d 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/StandardStaxReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/StandardStaxReaderTest.java
@@ -10,7 +10,6 @@
*/
package com.thoughtworks.xstream.io.xml;
-import com.thoughtworks.xstream.XStreamException;
import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -27,14 +26,7 @@ protected HierarchicalStreamReader createReader(String xml) throws Exception {
@Override
public void testIsXXEVulnerable() throws Exception {
- try {
- super.testIsXXEVulnerable();
- } catch (final XStreamException e) {
- final String message = e.getMessage();
- if (message.contains("ParseError") && message.contains("[1,1]")) {
- throw e;
- }
- }
+ super.testIsXXEVulnerable();
}
// inherits tests from superclass
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/StaxReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/StaxReaderTest.java
index bcc6fd81..1d9c09d9 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/StaxReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/StaxReaderTest.java
@@ -31,7 +31,7 @@ public void testIsXXEVulnerable() throws Exception {
fail("Thrown " + XStreamException.class.getName() + " expected");
} catch (final XStreamException e) {
final String message = e.getMessage();
- if (message.contains("Package")) {
+ if (!message.contains("external entity")) {
throw e;
}
}
diff --git a/xstream/src/test/com/thoughtworks/xstream/io/xml/WstxReaderTest.java b/xstream/src/test/com/thoughtworks/xstream/io/xml/WstxReaderTest.java
index 926ae277..26193941 100644
--- a/xstream/src/test/com/thoughtworks/xstream/io/xml/WstxReaderTest.java
+++ b/xstream/src/test/com/thoughtworks/xstream/io/xml/WstxReaderTest.java
@@ -32,7 +32,7 @@ public void testIsXXEVulnerable() throws Exception {
fail("Thrown " + XStreamException.class.getName() + " expected");
} catch (final XStreamException e) {
final String message = e.getMessage();
- if (message.contains("Package")) {
+ if (!message.contains("external entity")) {
throw e;
}
}
| 1
|
ffbcb4b11b40c52253b02098ca0225b9cf426cd2
|
https://github.com/apache/cassandra/commit/ffbcb4b11b40c52253b02098ca0225b9cf426cd2
|
add a close() method to CRAR to prevent leaking file descriptors
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4820
|
diff --git a/CHANGES.txt b/CHANGES.txt
index f243c7438d7..36b475886ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.1.7
* fix wrong leveled compaction progress calculation (CASSANDRA-4807)
+ * add a close() method to CRAR to prevent leaking file descriptors (CASSANDRA-4820)
1.1.6
* Wait for writes on synchronous read digest mismatch (CASSANDRA-4792)
diff --git a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
index c83fd9081a7..54031207392 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -124,6 +124,13 @@ public long length() throws IOException
return metadata.dataLength;
}
+ @Override
+ public void close() throws IOException
+ {
+ super.close();
+ source.close();
+ }
+
@Override
public String toString()
{
| 1
|
e8c86728ebccbace559d094a23b2e2001659b9fc
|
https://github.com/Sigil-Ebook/Sigil/commit/e8c86728ebccbace559d094a23b2e2001659b9fc
|
fix bad encryption.xml causing Sigil to hang on load
|
diff --git a/src/BookManipulation/FolderKeeper.cpp b/src/BookManipulation/FolderKeeper.cpp
index 6bb742013..d92a67874 100644
--- a/src/BookManipulation/FolderKeeper.cpp
+++ b/src/BookManipulation/FolderKeeper.cpp
@@ -29,6 +29,7 @@
#include <QtWidgets/QApplication>
#include <QRegularExpression>
#include <QRegularExpressionMatch>
+#include <QDebug>
#include "BookManipulation/FolderKeeper.h"
#include "sigil_constants.h"
diff --git a/src/Importers/ImportEPUB.cpp b/src/Importers/ImportEPUB.cpp
index 3b4c86491..a26a90ea8 100644
--- a/src/Importers/ImportEPUB.cpp
+++ b/src/Importers/ImportEPUB.cpp
@@ -295,6 +295,9 @@ QHash<QString, QString> ImportEPUB::ParseEncryptionXml()
} else if (encryption.name() == "CipherReference") {
// Note: fragments are not part of the CipherReference specs so this is okay
uri = Utility::URLDecodePath(encryption.attributes().value("", "URI").toString());
+ // hack to handle non-spec encryption file url relative to META-INF instead
+ // of being absolute from epub root as the spec calls for
+ if (uri.startsWith("../")) uri = uri.mid(3,-1);
encrypted_files[ uri ] = encryption_algo;
}
}
| 0
|
dc353dfb16e7811545c066931f5cfcbadbe79395
|
https://github.com/ronf/asyncssh/commit/dc353dfb16e7811545c066931f5cfcbadbe79395
|
Raise BrokenPipeError when SSH transport connection is broken
|
diff --git a/asyncssh/connection.py b/asyncssh/connection.py
index d30a928..449ee63 100644
--- a/asyncssh/connection.py
+++ b/asyncssh/connection.py
@@ -997,6 +997,9 @@ def _send(self, data):
"""Send data to the SSH connection"""
if self._transport:
+ if self._transport.is_closing():
+ raise BrokenPipeError
+
self._transport.write(data)
def _send_version(self):
| 0
|
6e2196824dbb50025e2ac822f6adbebb9d48b8dc
|
https://github.com/mde/ejs/commit/6e2196824dbb50025e2ac822f6adbebb9d48b8dc
|
test(includer): rename first param (url -> original)
|
diff --git a/test/ejs.js b/test/ejs.js
index 1052e3b5..5360499d 100755
--- a/test/ejs.js
+++ b/test/ejs.js
@@ -1017,7 +1017,7 @@ suite('include()', function () {
test('include ejs with includer returning template', function () {
var file = 'test/fixtures/include-root.ejs';
var inc = function (original, prev) {
- if (original === '/include.ejs') {
+ if (prev === '/include.ejs') {
return {
template: '<p>Hello template!</p>\n'
};
| 0
|
b7d449cfe4e3119dbe09f3e98ab0ff41b4235ee0
|
https://github.com/F21/jwt/commit/b7d449cfe4e3119dbe09f3e98ab0ff41b4235ee0
|
Initial commit.
|
diff --git a/jwt/jwt.php b/jwt/jwt.php
new file mode 100644
index 0000000..378ebc1
--- /dev/null
+++ b/jwt/jwt.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Implements JWT encoding and decoding as per http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-06
+ * Encoding and decoding alogrithm based on http://code.google.com/p/google-api-php-client/
+ * @author F21
+ */
+
+class JWT{
+
+ public static function encode($payload, $key, $algo = 'HS256'){
+
+ $header = array('typ' => 'JWT', 'alg' => $algo);
+
+ $segments = array(
+ JWT::urlsafeB64Encode(json_encode($header)),
+ JWT::urlsafeB64Encode(json_encode($payload))
+ );
+
+ $signing_input = implode('.', $segments);
+
+
+ $signature = JWT::sign($signing_input, $key, $algo);
+ $segments[] = JWT::urlsafeB64Encode($signature);
+
+ return implode('.', $segments);
+ }
+
+ public static function decode($jwt, $key = null, $verify = true){
+
+ $tks = explode('.', $jwt);
+
+ if (count($tks) != 3) {
+ throw new Exception('Wrong number of segments');
+ }
+
+ list($headb64, $payloadb64, $cryptob64) = $tks;
+
+ if (null === ($header = json_decode(JWT::urlsafeB64Decode($headb64)))){
+ throw new Exception('Invalid segment encoding');
+ }
+
+ if (null === $payload = json_decode(JWT::urlsafeB64Decode($payloadb64))){
+ throw new Exception('Invalid segment encoding');
+ }
+
+ $sig = JWT::urlsafeB64Decode($cryptob64);
+
+ if ($verify) {
+ if (empty($header->alg)) {
+ throw new DomainException('Empty algorithm');
+ }
+
+ if (!JWT::verifySignature($sig, "$headb64.$payloadb64", $key, $header->alg)) {
+ throw new UnexpectedValueException('Signature verification failed');
+ }
+ }
+
+ return $payload;
+ }
+
+ private static function verifySignature($signature, $input, $key, $algo = 'HS256'){
+
+ switch($algo){
+ case'HS256':
+ case'HS384':
+ case'HS512':
+ return JWT::sign($input, $key, $algo) === $signature;
+
+ case 'RS256':
+ return (boolean)openssl_verify($input, $signature, $key, OPENSSL_ALGO_SHA256);
+ }
+ }
+
+ private static function sign($input, $key, $algo = 'HS256'){
+
+ switch($algo){
+
+ case 'HS256':
+ return hash_hmac('sha256', $input, $key, true);
+
+ case 'HS384':
+ return hash_hmac('sha384', $input, $key, true);
+
+ case 'HS512':
+ return hash_hmac('sha512', $input, $key, true);
+
+ case 'RS256':
+ if (!openssl_sign($input, $signature, $key, OPENSSL_ALGO_SHA256)) {
+ throw new Exception("Unable to sign data.");
+ }
+
+ return $signature;
+
+ default:
+ throw new Exception("Unsupported or invalid signing algorithm.");
+ }
+ }
+
+ private static function urlSafeB64Encode($data){
+ $b64 = base64_encode($data);
+ $b64 = str_replace(array('+', '/', '\r', '\n', '='),
+ array('-', '_'),
+ $b64);
+ return $b64;
+ }
+
+ private static function urlSafeB64Decode($b64){
+ $b64 = str_replace(array('-', '_'),
+ array('+', '/'),
+ $b64);
+ return base64_decode($b64);
+ }
+}
\ No newline at end of file
| 0
|
e4de9bc101efc7f18e9a33009bfb3291b8342bfa
|
https://github.com/openstack-infra/puppet-gerrit/commit/e4de9bc101efc7f18e9a33009bfb3291b8342bfa
|
Merge "Fix placement of ssh public key"
|
diff --git a/manifests/init.pp b/manifests/init.pp
index 9f72708..a99a1d0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -658,7 +658,7 @@
}
if $ssh_replication_rsa_pubkey_contents != '' {
- file { '/home/gerrit2/id_rsa.pub':
+ file { '/home/gerrit2/.ssh/id_rsa.pub':
owner => 'gerrit2',
group => 'gerrit2',
mode => '0644',
| 0
|
f9b1c60ae4686ea2991f4644f92733d271d61072
|
https://github.com/bmizerany/sinatra/commit/f9b1c60ae4686ea2991f4644f92733d271d61072
|
wrap sinatra stack for nicer handling, fixes #496
|
diff --git a/CHANGES b/CHANGES
index 2bf04ac8d3..31f065002c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,11 @@
* Status, headers and body will be set correctly in an after filter when using
halt in a before filter or route. (Konstantin Haase)
+ * Sinatra::Base.new now returns a Sinatra::Wrapper instance, exposing
+ #settings and #helpers, yet going through the middleware stack on #call.
+ It also implements a nice #inspect, so it plays nice with Rails' `rake
+ routes`. (Konstantin Haase)
+
= 1.3.3 / Not Yet Released
* When keeping a stream open, set up callback/errback correctly to deal with
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
index f1c3008d2b..02cdae44e3 100644
--- a/lib/sinatra/base.rb
+++ b/lib/sinatra/base.rb
@@ -1409,7 +1409,8 @@ def prototype
# pipeline. The object is guaranteed to respond to #call but may not be
# an instance of the class new was called on.
def new(*args, &bk)
- build(new!(*args, &bk)).to_app
+ instance = new!(*args, &bk)
+ Wrapper.new(build(instance).to_app, instance)
end
# Creates a Rack::Builder instance with all the middleware set up and
@@ -1724,6 +1725,28 @@ class << self
self.target = Application
end
+ class Wrapper
+ def initialize(stack, instance)
+ @stack, @instance = stack, instance
+ end
+
+ def settings
+ @instance.settings
+ end
+
+ def helpers
+ @instance
+ end
+
+ def call(env)
+ @stack.call(env)
+ end
+
+ def inspect
+ "#<#{@instance.class} app_file=#{settings.app_file.inspect}>"
+ end
+ end
+
# Create a new Sinatra application. The block is evaluated in the new app's
# class scope.
def self.new(base=Base, options={}, &block)
diff --git a/test/base_test.rb b/test/base_test.rb
index 32a0d48dac..b5dc4ad7ac 100644
--- a/test/base_test.rb
+++ b/test/base_test.rb
@@ -56,6 +56,24 @@ class TestApp < Sinatra::Base
end
end
+ describe "Sinatra::Base#new" do
+ it 'returns a wrapper' do
+ assert_equal Sinatra::Wrapper, Sinatra::Base.new.class
+ end
+
+ it 'implements a nice inspect' do
+ assert_equal '#<Sinatra::Base app_file=nil>', Sinatra::Base.new.inspect
+ end
+
+ it 'exposes settings' do
+ assert_equal Sinatra::Base.settings, Sinatra::Base.new.settings
+ end
+
+ it 'expses helpers' do
+ assert_equal 'image/jpeg', Sinatra::Base.new.helpers.mime_type(:jpg)
+ end
+ end
+
describe "Sinatra::Base as Rack middleware" do
app = lambda { |env|
headers = {'X-Downstream' => 'true'}
| 0
|
0ba5e0d22dbc21d4c05dcdf1f8b066dab3d499cc
|
https://github.com/OpenSC/pam_p11/commit/0ba5e0d22dbc21d4c05dcdf1f8b066dab3d499cc
|
removed unused check
|
diff --git a/src/base64.c b/src/base64.c
index 420fe8f..5ce4dae 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -50,7 +50,7 @@ static int from_base64(const char *in, unsigned int *out, int *skip)
unsigned char b;
int k = *in;
- if (k < 0 || k >= (int)sizeof(bin_table))
+ if (k < 0)
return -1;
if (k == 0 && c == 0)
return 0;
| 0
|
d9bf3599cb3f082a9271c75e19cb4f7c282cbcd0
|
https://github.com/zkat/ssri/commit/d9bf3599cb3f082a9271c75e19cb4f7c282cbcd0
|
meta: drop support for node@4
BREAKING CHANGE: node@4 is no longer supported
|
diff --git a/.travis.yml b/.travis.yml
index 7723689..32d9400 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,3 @@ node_js:
- "9"
- "8"
- "6"
- - "4"
diff --git a/appveyor.yml b/appveyor.yml
index 592631c..811beed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@ environment:
- nodejs_version: "9"
- nodejs_version: "8"
- nodejs_version: "6"
- - nodejs_version: "4"
platform:
- x64
| 0
|
08b38378de702b893ee869b94b32f833e2933bd2
|
https://github.com/golang/net/commit/08b38378de702b893ee869b94b32f833e2933bd2
|
http2: add ConfigureTransports
The ConfigureTransport function doesn't provide any way to get at the
http2 Transport it creates, making it impossible to configure transport
parameters such as ReadIdleTimeout.
Add a ConfigureTransports function which returns the http2 Transport.
The very similar names are unfortunate, but they'll sort next to each
other in godoc and the pluralized ConfigureTransports hints at its purpose:
it lets you configure both the http and http2 transports.
Fixes golang/go#40201.
Updates golang/go#41721.
Change-Id: I97aa345f369f49462c41d3f60d35660c06c51287
Reviewed-on: https://go-review.googlesource.com/c/net/+/264017
Trust: Damien Neil <[email protected]>
Trust: Brad Fitzpatrick <[email protected]>
Run-TryBot: Damien Neil <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>
|
diff --git a/http2/transport.go b/http2/transport.go
index 4182f52b4..974a3c289 100644
--- a/http2/transport.go
+++ b/http2/transport.go
@@ -154,12 +154,21 @@ func (t *Transport) pingTimeout() time.Duration {
// ConfigureTransport configures a net/http HTTP/1 Transport to use HTTP/2.
// It returns an error if t1 has already been HTTP/2-enabled.
+//
+// Use ConfigureTransports instead to configure the HTTP/2 Transport.
func ConfigureTransport(t1 *http.Transport) error {
- _, err := configureTransport(t1)
+ _, err := ConfigureTransports(t1)
return err
}
-func configureTransport(t1 *http.Transport) (*Transport, error) {
+// ConfigureTransports configures a net/http HTTP/1 Transport to use HTTP/2.
+// It returns a new HTTP/2 Transport for further configuration.
+// It returns an error if t1 has already been HTTP/2-enabled.
+func ConfigureTransports(t1 *http.Transport) (*Transport, error) {
+ return configureTransports(t1)
+}
+
+func configureTransports(t1 *http.Transport) (*Transport, error) {
connPool := new(clientConnPool)
t2 := &Transport{
ConnPool: noDialClientConnPool{connPool},
| 0
|
766c136f134bf4f66351c8ab6fca1f11a987cc8a
|
https://github.com/Bcfg2/bcfg2/commit/766c136f134bf4f66351c8ab6fca1f11a987cc8a
|
Reporting: Fix add_url_filter fallback
django-1.8 deprecated referencing views as strings in the url(), so we
need to import the fallback view and referencing the view function
directly.
|
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
index 5c50c614d..6f86cd3a3 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
@@ -11,6 +11,7 @@
from datetime import datetime, timedelta
from Bcfg2.Reporting.utils import filter_list
from Bcfg2.Reporting.models import Group
+from Bcfg2.Reporting.views import render_history_view
register = template.Library()
@@ -213,7 +214,7 @@ class AddUrlFilter(template.Node):
def __init__(self, filter_name, filter_value):
self.filter_name = filter_name
self.filter_value = filter_value
- self.fallback_view = 'Bcfg2.Reporting.views.render_history_view'
+ self.fallback_view = render_history_view
def render(self, context):
link = '#'
| 0
|
a843e4209292e21d2d86fc600a6d4a87a4a9037a
|
https://github.com/android/platform_bionic/commit/a843e4209292e21d2d86fc600a6d4a87a4a9037a
|
Merge changes I486e54a1,Idda7161b,Iaf6b6b6a
* changes:
Convert generate-NOTICE.py to Python 3, fix name.
Convert genfunctosyscallnrs to Python 3.
Convert gensecomp.py to Python 3.
|
diff --git a/libc/tools/Android.bp b/libc/tools/Android.bp
index 2efb8a6713f..bf515ca316a 100644
--- a/libc/tools/Android.bp
+++ b/libc/tools/Android.bp
@@ -16,15 +16,6 @@ python_binary_host {
data: [
":all_kernel_uapi_headers",
],
-
- version: {
- py2: {
- enabled: true,
- },
- py3: {
- enabled: false,
- },
- },
}
python_binary_host {
@@ -40,13 +31,4 @@ python_binary_host {
data: [
":all_kernel_uapi_headers",
],
-
- version: {
- py2: {
- enabled: true,
- },
- py3: {
- enabled: false,
- },
- },
}
diff --git a/libc/tools/generate-NOTICE.py b/libc/tools/generate_notice.py
similarity index 61%
rename from libc/tools/generate-NOTICE.py
rename to libc/tools/generate_notice.py
index b6deb9cd269..e0e6b32156f 100755
--- a/libc/tools/generate-NOTICE.py
+++ b/libc/tools/generate_notice.py
@@ -1,28 +1,29 @@
#!/usr/bin/env python
-# Run with directory arguments from any directory, with no special setup required.
+# Run with directory arguments from any directory, with no special setup
+# required.
-import ftplib
-import hashlib
import os
+from pathlib import Path
import re
-import shutil
-import string
-import subprocess
import sys
-import tarfile
-import tempfile
+from typing import Sequence
VERBOSE = False
+copyrights = set()
+
+
def warn(s):
sys.stderr.write("warning: %s\n" % s)
+
def warn_verbose(s):
if VERBOSE:
warn(s)
-def is_interesting(path):
- path = path.lower()
+
+def is_interesting(path_str: str) -> bool:
+ path = Path(path_str.lower())
uninteresting_extensions = [
".bp",
".map",
@@ -33,12 +34,13 @@ def is_interesting(path):
".swp",
".txt",
]
- if os.path.splitext(path)[1] in uninteresting_extensions:
+ if path.suffix in uninteresting_extensions:
return False
- if path.endswith("/notice") or path.endswith("/readme") or path.endswith("/pylintrc"):
+ if path.name in {"notice", "readme", "pylintrc"}:
return False
return True
+
def is_auto_generated(content):
if "Generated by gensyscalls.py" in content or "generated by genserv.py" in content:
return True
@@ -46,14 +48,40 @@ def is_auto_generated(content):
return True
return False
-copyrights = set()
-def extract_copyright_at(lines, i):
- hash = lines[i].startswith("#")
+def is_copyright_end(line: str, first_line_was_hash: bool) -> bool:
+ endings = [
+ " $FreeBSD: ",
+ "$Citrus$",
+ "$FreeBSD$",
+ "*/",
+ "From: @(#)",
+ # OpenBSD likes to say where stuff originally came from:
+ "Original version ID:",
+ "\t$Citrus: ",
+ "\t$NetBSD: ",
+ "\t$OpenBSD: ",
+ "\t@(#)",
+ "\tcitrus Id: ",
+ "\tfrom: @(#)",
+ "from OpenBSD:",
+ ]
+ if first_line_was_hash and not line:
+ return True
+
+ for ending in endings:
+ if ending in line:
+ return True
+
+ return False
+
+
+def extract_copyright_at(lines: Sequence[str], i: int) -> int:
+ first_line_was_hash = lines[i].startswith("#")
# Do we need to back up to find the start of the copyright header?
start = i
- if not hash:
+ if not first_line_was_hash:
while start > 0:
if "/*" in lines[start - 1]:
break
@@ -62,20 +90,7 @@ def extract_copyright_at(lines, i):
# Read comment lines until we hit something that terminates a
# copyright header.
while i < len(lines):
- if "*/" in lines[i]:
- break
- if hash and len(lines[i]) == 0:
- break
- if "\t@(#)" in lines[i] or "\tfrom: @(#)" in lines[i] or "From: @(#)" in lines[i] or "from OpenBSD:" in lines[i]:
- break
- if "\tcitrus Id: " in lines[i]:
- break
- if "\t$Citrus: " in lines[i] or "\t$OpenBSD: " in lines[i] or " $FreeBSD: " in lines[i] or "\t$NetBSD: " in lines[i]:
- break
- if "$FreeBSD$" in lines[i] or "$Citrus$" in lines[i]:
- break
- # OpenBSD likes to say where stuff originally came from:
- if "Original version ID:" in lines[i]:
+ if is_copyright_end(lines[i], first_line_was_hash):
break
i += 1
@@ -83,7 +98,10 @@ def extract_copyright_at(lines, i):
# Trim trailing cruft.
while end > 0:
- if lines[end - 1] != " *" and lines[end - 1] != " * ====================================================":
+ line = lines[end - 1]
+ if line not in {
+ " *", " * ===================================================="
+ }:
break
end -= 1
@@ -92,7 +110,7 @@ def extract_copyright_at(lines, i):
for line in lines[start:end]:
line = line.replace("\t", " ")
line = line.replace("/* ", "")
- line = re.sub("^ \* ", "", line)
+ line = re.sub(r"^ \* ", "", line)
line = line.replace("** ", "")
line = line.replace("# ", "")
if "SPDX-License-Identifier:" in line:
@@ -102,7 +120,7 @@ def extract_copyright_at(lines, i):
line = line.replace("--Copyright--", "")
line = line.rstrip()
# These come last and take care of "blank" comment lines.
- if line == "#" or line == " *" or line == "**" or line == "-":
+ if line in {"#", " *", "**", "-"}:
line = ""
clean_lines.append(line)
@@ -112,19 +130,18 @@ def extract_copyright_at(lines, i):
while clean_lines[len(clean_lines) - 1] == "":
clean_lines = clean_lines[0:(len(clean_lines) - 1)]
- copyright = "\n".join(clean_lines)
- copyrights.add(copyright)
+ copyrights.add("\n".join(clean_lines))
return i
-def do_file(path):
- with open(path, "r") as the_file:
- try:
- content = open(path, "r").read().decode("utf-8")
- except UnicodeDecodeError:
- warn("bad UTF-8 in %s" % path)
- content = open(path, "r").read().decode("iso-8859-1")
+def do_file(path: str) -> None:
+ raw = Path(path).read_bytes()
+ try:
+ content = raw.decode("utf-8")
+ except UnicodeDecodeError:
+ warn("bad UTF-8 in %s" % path)
+ content = raw.decode("iso-8859-1")
lines = content.split("\n")
@@ -140,10 +157,12 @@ def do_file(path):
if "public domain" in content.lower():
warn_verbose("ignoring public domain file %s" % path)
return
- warn('no copyright notice found in "%s" (%d lines)' % (path, len(lines)))
+ warn('no copyright notice found in "%s" (%d lines)' %
+ (path, len(lines)))
return
- # Manually iterate because extract_copyright_at tells us how many lines to skip.
+ # Manually iterate because extract_copyright_at tells us how many lines to
+ # skip.
i = 0
while i < len(lines):
if "Copyright" in lines[i] and not "@(#) Copyright" in lines[i]:
@@ -152,7 +171,7 @@ def do_file(path):
i += 1
-def do_dir(path):
+def do_dir(arg):
for directory, sub_directories, filenames in os.walk(arg):
if ".git" in sub_directories:
sub_directories.remove(".git")
@@ -164,20 +183,23 @@ def do_dir(path):
do_file(path)
-args = sys.argv[1:]
-if len(args) == 0:
- args = [ "." ]
+def main() -> None:
+ args = sys.argv[1:]
+ if len(args) == 0:
+ args = ["."]
+
+ for arg in args:
+ if os.path.isdir(arg):
+ do_dir(arg)
+ else:
+ do_file(arg)
-for arg in args:
- if os.path.isdir(arg):
- do_dir(arg)
- else:
- do_file(arg)
+ for notice in sorted(copyrights):
+ print(notice)
+ print()
+ print("-" * 67)
+ print()
-for copyright in sorted(copyrights):
- print copyright.encode("utf-8")
- print
- print "-------------------------------------------------------------------"
- print
-sys.exit(0)
+if __name__ == "__main__":
+ main()
diff --git a/libc/tools/genfunctosyscallnrs.py b/libc/tools/genfunctosyscallnrs.py
index ecfc8abc11a..26642f9aec3 100755
--- a/libc/tools/genfunctosyscallnrs.py
+++ b/libc/tools/genfunctosyscallnrs.py
@@ -1,60 +1,71 @@
#!/usr/bin/env python
import argparse
-import collections
import logging
import os
import re
-import subprocess
-import textwrap
from gensyscalls import SupportedArchitectures, SysCallsTxtParser
from genseccomp import parse_syscall_NRs
+
def load_syscall_names_from_file(file_path, architecture):
- parser = SysCallsTxtParser()
- parser.parse_open_file(open(file_path))
- arch_map = {}
- for syscall in parser.syscalls:
- if syscall.get(architecture):
- arch_map[syscall["func"]] = syscall["name"];
+ parser = SysCallsTxtParser()
+ parser.parse_open_file(open(file_path))
+ arch_map = {}
+ for syscall in parser.syscalls:
+ if syscall.get(architecture):
+ arch_map[syscall["func"]] = syscall["name"]
+
+ return arch_map
- return arch_map
def gen_syscall_nrs(out_file, base_syscall_file, syscall_NRs):
- for arch in SupportedArchitectures:
- base_names = load_syscall_names_from_file(base_syscall_file, arch)
+ for arch in SupportedArchitectures:
+ base_names = load_syscall_names_from_file(base_syscall_file, arch)
+
+ for func, syscall in base_names.items():
+ out_file.write("#define __" + arch + "_" + func + " " +
+ str(syscall_NRs[arch][syscall]) + ";\n")
- for func,syscall in base_names.iteritems():
- out_file.write("#define __" + arch + "_" + func + " " + str(syscall_NRs[arch][syscall]) + ";\n")
def main():
- parser = argparse.ArgumentParser(
- description="Generates a mapping of bionic functions to system call numbers per architecture.")
- parser.add_argument("--verbose", "-v", help="Enables verbose logging.")
- parser.add_argument("--out-dir",
- help="The output directory for the output files")
- parser.add_argument("base_file", metavar="base-file", type=str,
- help="The path of the base syscall list (SYSCALLS.TXT).")
- parser.add_argument("files", metavar="FILE", type=str, nargs="+",
- help=("A syscall name-number mapping file for an architecture.\n"))
- args = parser.parse_args()
-
- if args.verbose:
- logging.basicConfig(level=logging.DEBUG)
- else:
- logging.basicConfig(level=logging.INFO)
-
- syscall_files = []
- syscall_NRs = {}
- for filename in args.files:
- m = re.search(r"libseccomp_gen_syscall_nrs_([^/]+)", filename)
- syscall_NRs[m.group(1)] = parse_syscall_NRs(filename)
-
- output_path = os.path.join(args.out_dir, "func_to_syscall_nrs.h")
- with open(output_path, "w") as output_file:
- gen_syscall_nrs(out_file=output_file,
- syscall_NRs=syscall_NRs, base_syscall_file=args.base_file)
+ parser = argparse.ArgumentParser(
+ description=
+ "Generates a mapping of bionic functions to system call numbers per architecture."
+ )
+ parser.add_argument("--verbose", "-v", help="Enables verbose logging.")
+ parser.add_argument("--out-dir",
+ help="The output directory for the output files")
+ parser.add_argument(
+ "base_file",
+ metavar="base-file",
+ type=str,
+ help="The path of the base syscall list (SYSCALLS.TXT).")
+ parser.add_argument(
+ "files",
+ metavar="FILE",
+ type=str,
+ nargs="+",
+ help=("A syscall name-number mapping file for an architecture.\n"))
+ args = parser.parse_args()
+
+ if args.verbose:
+ logging.basicConfig(level=logging.DEBUG)
+ else:
+ logging.basicConfig(level=logging.INFO)
+
+ syscall_NRs = {}
+ for filename in args.files:
+ m = re.search(r"libseccomp_gen_syscall_nrs_([^/]+)", filename)
+ syscall_NRs[m.group(1)] = parse_syscall_NRs(filename)
+
+ output_path = os.path.join(args.out_dir, "func_to_syscall_nrs.h")
+ with open(output_path, "w") as output_file:
+ gen_syscall_nrs(out_file=output_file,
+ syscall_NRs=syscall_NRs,
+ base_syscall_file=args.base_file)
+
if __name__ == "__main__":
- main()
+ main()
diff --git a/libc/tools/genseccomp.py b/libc/tools/genseccomp.py
index 89eeb445952..a78f6c140e2 100755
--- a/libc/tools/genseccomp.py
+++ b/libc/tools/genseccomp.py
@@ -1,11 +1,10 @@
#!/usr/bin/env python
import argparse
-import collections
import logging
+import operator
import os
import re
-import subprocess
import textwrap
from gensyscalls import SupportedArchitectures, SysCallsTxtParser
@@ -16,7 +15,7 @@
BPF_ALLOW = "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW)"
-class SyscallRange(object):
+class SyscallRange:
def __init__(self, name, value):
self.names = [name]
self.begin = value
@@ -35,23 +34,23 @@ def add(self, name, value):
def load_syscall_names_from_file(file_path, architecture):
parser = SysCallsTxtParser()
parser.parse_open_file(open(file_path))
- return set([x["name"] for x in parser.syscalls if x.get(architecture)])
+ return {x["name"] for x in parser.syscalls if x.get(architecture)}
def load_syscall_priorities_from_file(file_path):
format_re = re.compile(r'^\s*([A-Za-z_][A-Za-z0-9_]+)\s*$')
priorities = []
- with open(file_path) as f:
- for line in f:
- m = format_re.match(line)
- if not m:
+ with open(file_path) as priority_file:
+ for line in priority_file:
+ match = format_re.match(line)
+ if match is None:
continue
try:
- name = m.group(1)
+ name = match.group(1)
priorities.append(name)
- except:
- logging.debug('Failed to parse %s from %s', (line, file_path))
- pass
+ except IndexError:
+ # TODO: This should be impossible becauase it wouldn't have matched?
+ logging.exception('Failed to parse %s from %s', line, file_path)
return priorities
@@ -93,7 +92,7 @@ def parse_syscall_NRs(names_path):
with open(names_path) as f:
for line in f:
m = constant_re.match(line)
- if not m:
+ if m is None:
continue
try:
name = m.group(1)
@@ -102,12 +101,21 @@ def parse_syscall_NRs(names_path):
m.group(2)))
constants[name] = value
- except:
+ except: # pylint: disable=bare-except
+ # TODO: This seems wrong.
+ # Key error doesn't seem like the error the original author was trying
+ # to catch. It looks like the intent was to catch IndexError from
+ # match.group() for non-matching lines, but that's impossible because
+ # the match object is checked and continued if not matched. What
+ # actually happens is that KeyError is thrown by constants[x.group(0)]
+ # on at least the first run because the dict is empty.
+ #
+ # It's also matching syntax errors because not all C integer literals
+ # are valid Python integer literals, e.g. 10L.
logging.debug('Failed to parse %s', line)
- pass
syscalls = {}
- for name, value in constants.iteritems():
+ for name, value in constants.items():
if not name.startswith("__NR_") and not name.startswith("__ARM_NR"):
continue
if name.startswith("__NR_"):
@@ -120,7 +128,7 @@ def parse_syscall_NRs(names_path):
def convert_NRs_to_ranges(syscalls):
# Sort the values so we convert to ranges and binary chop
- syscalls = sorted(syscalls, lambda x, y: cmp(x[1], y[1]))
+ syscalls = sorted(syscalls, key=operator.itemgetter(1))
# Turn into a list of ranges. Keep the names for the comments
ranges = []
@@ -148,12 +156,12 @@ def convert_to_intermediate_bpf(ranges):
# We will replace {fail} and {allow} with appropriate range jumps later
return [BPF_JGE.format(ranges[0].end, "{fail}", "{allow}") +
", //" + "|".join(ranges[0].names)]
- else:
- half = (len(ranges) + 1) / 2
- first = convert_to_intermediate_bpf(ranges[:half])
- second = convert_to_intermediate_bpf(ranges[half:])
- jump = [BPF_JGE.format(ranges[half].begin, len(first), 0) + ","]
- return jump + first + second
+
+ half = (len(ranges) + 1) // 2
+ first = convert_to_intermediate_bpf(ranges[:half])
+ second = convert_to_intermediate_bpf(ranges[half:])
+ jump = [BPF_JGE.format(ranges[half].begin, len(first), 0) + ","]
+ return jump + first + second
# Converts the prioritized syscalls to a bpf list that is prepended to the
@@ -162,7 +170,7 @@ def convert_to_intermediate_bpf(ranges):
# immediately
def convert_priority_to_intermediate_bpf(priority_syscalls):
result = []
- for i, syscall in enumerate(priority_syscalls):
+ for syscall in priority_syscalls:
result.append(BPF_JEQ.format(syscall[1], "{allow}", 0) +
", //" + syscall[0])
return result
@@ -227,7 +235,8 @@ def construct_bpf(syscalls, architecture, name_modifier, priorities):
return convert_bpf_to_output(bpf, architecture, name_modifier)
-def gen_policy(name_modifier, out_dir, base_syscall_file, syscall_files, syscall_NRs, priority_file):
+def gen_policy(name_modifier, out_dir, base_syscall_file, syscall_files,
+ syscall_NRs, priority_file):
for arch in SupportedArchitectures:
base_names = load_syscall_names_from_file(base_syscall_file, arch)
allowlist_names = set()
@@ -251,7 +260,6 @@ def gen_policy(name_modifier, out_dir, base_syscall_file, syscall_files, syscall
output = construct_bpf(allowed_syscalls, arch, name_modifier, priorities)
# And output policy
- existing = ""
filename_modifier = "_" + name_modifier if name_modifier else ""
output_path = os.path.join(out_dir,
"{}{}_policy.cpp".format(arch, filename_modifier))
@@ -274,8 +282,8 @@ def main():
help=("The path of the input files. In order to "
"simplify the build rules, it can take any of the "
"following files: \n"
- "* /blocklist.*\.txt$/ syscall blocklist.\n"
- "* /allowlist.*\.txt$/ syscall allowlist.\n"
+ "* /blocklist.*\\.txt$/ syscall blocklist.\n"
+ "* /allowlist.*\\.txt$/ syscall allowlist.\n"
"* /priority.txt$/ priorities for bpf rules.\n"
"* otherwise, syscall name-number mapping.\n"))
args = parser.parse_args()
diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index 0e0e25f624e..d8d43029f8c 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -5,7 +5,6 @@
# makefiles used to build all the stubs.
import atexit
-import commands
import filecmp
import glob
import re
@@ -315,7 +314,7 @@ def __init__(self):
self.lineno = 0
def E(self, msg):
- print "%d: %s" % (self.lineno, msg)
+ print("%d: %s" % (self.lineno, msg))
def parse_line(self, line):
""" parse a syscall spec line.
@@ -340,7 +339,7 @@ def parse_line(self, line):
return
syscall_func = return_type[-1]
- return_type = string.join(return_type[:-1],' ')
+ return_type = ' '.join(return_type[:-1])
socketcall_id = -1
pos_colon = syscall_func.find(':')
@@ -372,13 +371,13 @@ def parse_line(self, line):
alias_delim = syscall_name.find('|')
if alias_delim > 0:
syscall_name = syscall_name[:alias_delim]
- syscall_aliases = string.split(alias_list, ',')
+ syscall_aliases = alias_list.split(',')
else:
syscall_aliases = []
if pos_rparen > pos_lparen+1:
syscall_params = line[pos_lparen+1:pos_rparen].split(',')
- params = string.join(syscall_params,',')
+ params = ','.join(syscall_params)
else:
syscall_params = []
params = "void"
@@ -398,7 +397,7 @@ def parse_line(self, line):
for arch in SupportedArchitectures:
t[arch] = True
else:
- for arch in string.split(arch_list, ','):
+ for arch in arch_list.split(','):
if arch == "lp32":
for arch in SupportedArchitectures:
if "64" not in arch:
@@ -464,7 +463,7 @@ def main(arch, syscall_file):
if __name__ == "__main__":
if len(sys.argv) < 2:
- print "Usage: gensyscalls.py ARCH SOURCE_FILE"
+ print("Usage: gensyscalls.py ARCH SOURCE_FILE")
sys.exit(1)
arch = sys.argv[1]
diff --git a/libc/tools/mypy.ini b/libc/tools/mypy.ini
new file mode 100644
index 00000000000..0269354546f
--- /dev/null
+++ b/libc/tools/mypy.ini
@@ -0,0 +1,3 @@
+[mypy]
+# TODO: Enable.
+# disallow_untyped_defs = True
diff --git a/libc/tools/pylintrc b/libc/tools/pylintrc
new file mode 100644
index 00000000000..df319e37882
--- /dev/null
+++ b/libc/tools/pylintrc
@@ -0,0 +1,8 @@
+[MESSAGES CONTROL]
+disable=
+ eval-used,
+ design,
+ fixme,
+ invalid-name,
+ logging-fstring-interpolation,
+ missing-docstring
diff --git a/libc/tools/test_genseccomp.py b/libc/tools/test_genseccomp.py
index 812218eb817..8bd35173231 100755
--- a/libc/tools/test_genseccomp.py
+++ b/libc/tools/test_genseccomp.py
@@ -1,176 +1,65 @@
#!/usr/bin/env python
# Unit tests for genseccomp.py
-import cStringIO
import textwrap
import unittest
import genseccomp
class TestGenseccomp(unittest.TestCase):
- def setUp(self):
- genseccomp.set_dir()
-
- def get_config(self, arch):
- for i in genseccomp.POLICY_CONFIGS:
- if i[0] == arch:
- return i
- self.fail("No such architecture")
-
- def get_headers(self, arch):
- return self.get_config(arch)[1]
-
- def get_switches(self, arch):
- return self.get_config(arch)[2]
-
- def test_get_names(self):
- bionic = cStringIO.StringIO(textwrap.dedent("""\
-int __llseek:_llseek(int, unsigned long, unsigned long, off64_t*, int) arm,x86
-int fchown:fchown(int, uid_t, gid_t) arm64,x86_64
- """))
-
- allowlist = cStringIO.StringIO(textwrap.dedent("""\
-ssize_t read(int, void*, size_t) all
- """))
-
- empty = cStringIO.StringIO(textwrap.dedent("""\
- """))
-
- names = genseccomp.get_names([bionic, allowlist, empty], "arm")
- bionic.seek(0)
- allowlist.seek(0)
- empty.seek(0)
- names64 = genseccomp.get_names([bionic, allowlist, empty], "arm64")
- bionic.seek(0)
- allowlist.seek(0)
- empty.seek(0)
-
- self.assertIn("fchown", names64)
- self.assertNotIn("fchown", names)
- self.assertIn("_llseek", names)
- self.assertNotIn("_llseek", names64)
- self.assertIn("read", names)
- self.assertIn("read", names64)
-
- # Blocklist item must be in bionic
- blocklist = cStringIO.StringIO(textwrap.dedent("""\
-int fchown2:fchown2(int, uid_t, gid_t) arm64,x86_64
- """))
- with self.assertRaises(RuntimeError):
- genseccomp.get_names([bionic, allowlist, blocklist], "arm")
- bionic.seek(0)
- allowlist.seek(0)
- blocklist.seek(0)
-
- # Test blocklist item is removed
- blocklist = cStringIO.StringIO(textwrap.dedent("""\
-int fchown:fchown(int, uid_t, gid_t) arm64,x86_64
- """))
- names = genseccomp.get_names([bionic, allowlist, blocklist], "arm64")
- bionic.seek(0)
- allowlist.seek(0)
- blocklist.seek(0)
- self.assertIn("read", names)
- self.assertNotIn("fchown", names)
-
- # Blocklist item must not be in allowlist
- allowlist = cStringIO.StringIO(textwrap.dedent("""\
-int fchown:fchown(int, uid_t, gid_t) arm64,x86_64
- """))
- with self.assertRaises(RuntimeError):
- genseccomp.get_names([empty, allowlist, blocklist], "arm")
- empty.seek(0)
- allowlist.seek(0)
- blocklist.seek(0)
-
- # No dups in bionic and allowlist
- allowlist = cStringIO.StringIO(textwrap.dedent("""\
-int __llseek:_llseek(int, unsigned long, unsigned long, off64_t*, int) arm,x86
- """))
- with self.assertRaises(RuntimeError):
- genseccomp.get_names([bionic, allowlist, empty], "arm")
- bionic.seek(0)
- allowlist.seek(0)
- empty.seek(0)
-
- def test_convert_names_to_NRs(self):
- self.assertEquals(genseccomp.convert_names_to_NRs(["open"],
- self.get_headers("arm"),
- self.get_switches("arm")),
- [("open", 5)])
-
- self.assertEquals(genseccomp.convert_names_to_NRs(["__ARM_NR_set_tls"],
- self.get_headers("arm"),
- self.get_switches("arm")),
- [('__ARM_NR_set_tls', 983045)])
-
- self.assertEquals(genseccomp.convert_names_to_NRs(["openat"],
- self.get_headers("arm64"),
- self.get_switches("arm64")),
- [("openat", 56)])
-
- self.assertEquals(genseccomp.convert_names_to_NRs(["openat"],
- self.get_headers("x86"),
- self.get_switches("x86")),
- [("openat", 295)])
-
- self.assertEquals(genseccomp.convert_names_to_NRs(["openat"],
- self.get_headers("x86_64"),
- self.get_switches("x86_64")),
- [("openat", 257)])
-
-
def test_convert_NRs_to_ranges(self):
ranges = genseccomp.convert_NRs_to_ranges([("b", 2), ("a", 1)])
- self.assertEquals(len(ranges), 1)
- self.assertEquals(ranges[0].begin, 1)
- self.assertEquals(ranges[0].end, 3)
- self.assertItemsEqual(ranges[0].names, ["a", "b"])
+ self.assertEqual(len(ranges), 1)
+ self.assertEqual(ranges[0].begin, 1)
+ self.assertEqual(ranges[0].end, 3)
+ self.assertEqual(set(ranges[0].names), {"a", "b"})
ranges = genseccomp.convert_NRs_to_ranges([("b", 3), ("a", 1)])
- self.assertEquals(len(ranges), 2)
- self.assertEquals(ranges[0].begin, 1)
- self.assertEquals(ranges[0].end, 2)
- self.assertItemsEqual(ranges[0].names, ["a"])
- self.assertEquals(ranges[1].begin, 3)
- self.assertEquals(ranges[1].end, 4)
- self.assertItemsEqual(ranges[1].names, ["b"])
+ self.assertEqual(len(ranges), 2)
+ self.assertEqual(ranges[0].begin, 1)
+ self.assertEqual(ranges[0].end, 2)
+ self.assertEqual(set(ranges[0].names), {"a"})
+ self.assertEqual(ranges[1].begin, 3)
+ self.assertEqual(ranges[1].end, 4)
+ self.assertEqual(set(ranges[1].names), {"b"})
def test_convert_to_intermediate_bpf(self):
ranges = genseccomp.convert_NRs_to_ranges([("b", 2), ("a", 1)])
bpf = genseccomp.convert_to_intermediate_bpf(ranges)
- self.assertEquals(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, {fail}, {allow}), //a|b'])
+ self.assertEqual(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, {fail}, {allow}), //a|b'])
ranges = genseccomp.convert_NRs_to_ranges([("b", 3), ("a", 1)])
bpf = genseccomp.convert_to_intermediate_bpf(ranges)
- self.assertEquals(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 1, 0),',
+ self.assertEqual(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 1, 0),',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 2, {fail}, {allow}), //a',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4, {fail}, {allow}), //b'])
def test_convert_ranges_to_bpf(self):
ranges = genseccomp.convert_NRs_to_ranges([("b", 2), ("a", 1)])
- bpf = genseccomp.convert_ranges_to_bpf(ranges)
- self.assertEquals(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 1, 0, 2),',
+ bpf = genseccomp.convert_ranges_to_bpf(ranges, priority_syscalls=[])
+ self.assertEqual(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 1, 0, 2),',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 1, 0), //a|b',
'BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW),'])
ranges = genseccomp.convert_NRs_to_ranges([("b", 3), ("a", 1)])
- bpf = genseccomp.convert_ranges_to_bpf(ranges)
- self.assertEquals(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 1, 0, 4),',
+ bpf = genseccomp.convert_ranges_to_bpf(ranges, priority_syscalls=[])
+ self.assertEqual(bpf, ['BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 1, 0, 4),',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 1, 0),',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 2, 2, 1), //a',
'BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4, 1, 0), //b',
'BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW),'])
def test_convert_bpf_to_output(self):
- output = genseccomp.convert_bpf_to_output(["line1", "line2"], "arm")
+ output = genseccomp.convert_bpf_to_output(["line1", "line2"],
+ "arm",
+ name_modifier="")
expected_output = textwrap.dedent("""\
- // Autogenerated file - edit at your peril!!
+ // File autogenerated by genseccomp.py - edit at your peril!!
#include <linux/filter.h>
#include <errno.h>
- #include "seccomp_bpfs.h"
+ #include "seccomp/seccomp_bpfs.h"
const sock_filter arm_filter[] = {
line1
line2
@@ -178,43 +67,7 @@ def test_convert_bpf_to_output(self):
const size_t arm_filter_size = sizeof(arm_filter) / sizeof(struct sock_filter);
""")
- self.assertEquals(output, expected_output)
-
- def test_construct_bpf(self):
- syscalls = cStringIO.StringIO(textwrap.dedent("""\
- int __llseek:_llseek(int, unsigned long, unsigned long, off64_t*, int) arm,x86
- int fchown:fchown(int, uid_t, gid_t) arm64,x86_64
- """))
-
- allowlist = cStringIO.StringIO(textwrap.dedent("""\
- ssize_t read(int, void*, size_t) all
- """))
-
- blocklist = cStringIO.StringIO(textwrap.dedent("""\
- """))
-
- syscall_files = [syscalls, allowlist, blocklist]
- output = genseccomp.construct_bpf(syscall_files, "arm", self.get_headers("arm"),
- self.get_switches("arm"))
-
- expected_output = textwrap.dedent("""\
- // Autogenerated file - edit at your peril!!
-
- #include <linux/filter.h>
- #include <errno.h>
-
- #include "seccomp_bpfs.h"
- const sock_filter arm_filter[] = {
- BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 0, 4),
- BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 140, 1, 0),
- BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4, 2, 1), //read
- BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 141, 1, 0), //_llseek
- BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW),
- };
-
- const size_t arm_filter_size = sizeof(arm_filter) / sizeof(struct sock_filter);
- """)
- self.assertEquals(output, expected_output)
+ self.assertEqual(output, expected_output)
if __name__ == '__main__':
diff --git a/tools/update_notice.sh b/tools/update_notice.sh
index a309bc26e84..302974f677d 100755
--- a/tools/update_notice.sh
+++ b/tools/update_notice.sh
@@ -1,7 +1,11 @@
#!/bin/bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR/..
-./libc/tools/generate-NOTICE.py libc libm > libc/NOTICE
+python3 ./libc/tools/generate_notice.py libc libm > libc/NOTICE
+if [ $? -ne 0 ]; then
+ >&2 echo NOTICE file generation failed
+ exit 1
+fi
git diff --exit-code HEAD libc/NOTICE
exit $?
| 0
|
41b6477bdeaa82c647db2f1c2ba1132c77b365ed
|
https://github.com/abrt/libreport/commit/41b6477bdeaa82c647db2f1c2ba1132c77b365ed
|
event_config: Null autofree pointers before returning
The pointers to strings in the function check_problem_rating_usability()
need to be nullified before the function returns as they are declared
for auto-cleanup.
This change fixes a double-free condition in which the returned strings
were attempted to be freed again in the caller,
is_backtrace_rating_usable().
Bug was introduced in 05e9c9273.
Resolves rhbz#1883410
|
diff --git a/src/lib/event_config.c b/src/lib/event_config.c
index c8053b7c8..01e91efe9 100644
--- a/src/lib/event_config.c
+++ b/src/lib/event_config.c
@@ -541,10 +541,10 @@ bool check_problem_rating_usability(const event_config_t *cfg,
finish:
if (description)
- *description = tmp_desc;
+ *description = g_steal_pointer(&tmp_desc);
if (detail)
- *detail = tmp_detail;
+ *detail = g_steal_pointer(&tmp_detail);
return result;
}
| 0
|
5870fd1037058bc4e43cccf893b576c72293371e#diff-d539f3f8185667ee48db78e1bf65a3b4R57
|
https://github.com/LimeSurvey/LimeSurvey/commit/5870fd1037058bc4e43cccf893b576c72293371e#diff-d539f3f8185667ee48db78e1bf65a3b4R57
|
Release 3.17.14+190902
|
diff --git a/application/config/version.php b/application/config/version.php
index faca17fa623..b4fb4714cdd 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -12,9 +12,9 @@
*/
-$config['versionnumber'] = '3.17.13';
+$config['versionnumber'] = '3.17.14';
$config['dbversionnumber'] = 359;
$config['buildnumber'] = '';
$config['updatable'] = true;
-$config['assetsversionnumber'] = '30095';
+$config['assetsversionnumber'] = '30096';
return $config;
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index a3718804316..95993aaff20 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -34,6 +34,46 @@ Thank you to everyone who helped with this new release!
CHANGE LOG
------------------------------------------------------
+Changes from 3.17.13 (build 190824) to 3.17.14 (build 190902) September 2, 2019
+-Fixed issue: setting "Show header in answers export PDFs" not taken in account (LouisGac)
+-Fixed issue: [security]XSS in admin box buttons - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]XML breakout possible on export - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]X-Frame-Options SAMEORIGIN not set by default - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]User unaware that SSL encryption should be enforced (Carsten Schmitz)
+-Fixed issue: [security]Path revelation (Carsten Schmitz)
+-Fixed issue: [security]LDAP login non-generic login message - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]LDAP login non-generic login message - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]Equation signs are not masked by default on data export (Carsten Schmitz)
+-Fixed issue: [security]Equation signs are not masked by default on data export (Carsten Schmitz)
+-Fixed issue: [security]CSRF cookie missing HTTP only parameter- kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]Admin user without permissions can still see plugins page - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]Admin user with settings permissions can can run integrity check - kindly reported by Pavol Michalec & Frederik Koľbík (Carsten Schmitz)
+-Fixed issue: [security]Admin user with limited permissions can view/update/delete reserved menu entries (Carsten Schmitz)
+-Fixed issue: [security]Admin user can mark other user notification as read (Carsten Schmitz)
+-Fixed issue: [security] Database backup uses browser cache (Carsten Schmitz)
+-Fixed issue: [security] Browser cache used for exports (Carsten Schmitz)
+-Fixed issue: [security] #15204: Stored XSS vulnerabilities - Thanks to J. Greil from the SEC Consult Vulnerability Lab (https://www.sec-consult.com) (Denis Chenu)
+-Fixed issue: [security] #15204: Reflected XSS vulnerabilities - thanks to J. Greil from the SEC Consult Vulnerability Lab (Denis Chenu)
+-Fixed issue: Survey upload self-reflecting XSS (Carsten Schmitz)
+-Fixed issue: Sidebar not working on IE11 (lacrioque)
+-Fixed issue: Memory issues if too many responses exist for the same token in a non-anonymous survey (Carsten Schmitz)
+-Fixed issue: Memory issues if too many responses exist for the same token in a non-anonymous survey (Carsten Schmitz)
+-Fixed issue: LsTutorial only working in debug mode (lacrioque)
+-Fixed issue: Language not updated on import and overwrite in CPDB (lacrioque)
+-Fixed issue: JS error in firstStartTour onShow code (#1315) (Martin Unkel)
+-Fixed issue: After survey activation the ExpressionManager cache was not updated (Carsten Schmitz)
+-Fixed issue #15212: Survey navigation shows message "Please use the survey navigation buttons...[]" instead of navigating (Carsten Schmitz)
+-Fixed issue #15209: 500 error when try to save long administrator name (Denis Chenu)
+-Fixed issue #15208: MSSQL error on 2nd page of theme (Denis Chenu)
+-Fixed issue #15199: MSSQL : date/time question are not reloaded properly (Denis Chenu)
+-Fixed issue #15197: Submitting empty menu entry crashes application ( Application Denial of Service) (lacrioque)
+-Fixed issue #15194: Unable to remove page title from PDF generated at "print answers" screen (LouisGac)
+-Fixed issue #15192: entering html code inside the answeroptions for List type questions will break/alter the html for editing answers (Patrick Teichmann)
+-Fixed issue #15188: Access Label sets list (lacrioque)
+-Fixed issue #14863: Extending core theme using the same core theme name (Eddy Lackmann)
+-Fixed issue #10168: Commit test! Ignore (Carsten Schmitz)
+-New translation: Filipino (Carsten Schmitz)
+
Changes from 3.17.12 (build 190823) to 3.17.13 (build 190824) August 24, 2019
-Fixed issue #15185: Surveys with less or more then 4-6 digits will not display the sidepanel (Patrick Teichmann)
| 1
|
9881744c95737264c7cd9f13b3c70042c03584aa
|
https://github.com/veracrypt/VeraCrypt/commit/9881744c95737264c7cd9f13b3c70042c03584aa
|
Windows: Add support for ARM64 platform (e.g. Microsoft Surface Pro X). System encryption still not implemented on ARM64
|
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index 5ca39afed..0ecdfba47 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -796,8 +796,6 @@ namespace VeraCrypt
if (Elevated)
{
- DWORD bytesRead;
-
Elevator::ReadWriteFile (false, IsDevice, Path, buffer, FilePointerPosition, size, &bytesRead);
FilePointerPosition += bytesRead;
return bytesRead;
@@ -5173,6 +5171,9 @@ namespace VeraCrypt
if (CurrentOSMajor == 6 && CurrentOSMinor == 0 && CurrentOSServicePack < 1)
throw ErrorException ("SYS_ENCRYPTION_UNSUPPORTED_ON_VISTA_SP0", SRC_POS);
+ if (IsARM())
+ throw ErrorException ("SYS_ENCRYPTION_UNSUPPORTED_ON_CURRENT_OS", SRC_POS);
+
if (IsNonInstallMode())
throw ErrorException ("FEATURE_REQUIRES_INSTALLATION", SRC_POS);
diff --git a/src/Common/Common.rc b/src/Common/Common.rc
index d55e31b92..b26a400af 100644
--- a/src/Common/Common.rc
+++ b/src/Common/Common.rc
@@ -506,6 +506,7 @@ END
//
// BIN
//
+#ifndef ARM64
IDR_BOOT_SECTOR BIN "..\\Boot\\Windows\\Release\\BootSector.bin"
IDR_BOOT_SECTOR_AES BIN "..\\Boot\\Windows\\Release_AES\\BootSector.bin"
@@ -572,6 +573,7 @@ IDR_EFI_DCSBML32 BIN "..\\Boot\\EFI\\DcsBml32.efi"
IDR_EFI_DCSRE32 BIN "..\\Boot\\EFI\\DcsRe32.efi"
IDR_EFI_DCSINFO32 BIN "..\\Boot\\EFI\\DcsInfo32.efi"
#endif
+#endif
/////////////////////////////////////////////////////////////////////////////
//
// XML
diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 550de2b3b..4745f981b 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -1195,6 +1195,8 @@ BOOL IsAesHwCpuSupported ()
}
return state && !HwEncryptionDisabled;
+#elif defined (_M_ARM64)
+ return 0;
#else
return (HasAESNI() && !HwEncryptionDisabled)? TRUE : FALSE;
#endif
@@ -1476,3 +1478,29 @@ void VcUnprotectKeys (PCRYPTO_INFO pCryptoInfo, uint64 encID)
#endif
+#ifdef _M_ARM64
+/* dummy implementation that should never be called */
+void aes_hw_cpu_decrypt(const byte* ks, byte* data)
+{
+ ks = ks;
+ data = data;
+}
+
+void aes_hw_cpu_decrypt_32_blocks(const byte* ks, byte* data)
+{
+ ks = ks;
+ data = data;
+}
+
+void aes_hw_cpu_encrypt(const byte* ks, byte* data)
+{
+ ks = ks;
+ data = data;
+}
+
+void aes_hw_cpu_encrypt_32_blocks(const byte* ks, byte* data)
+{
+ ks = ks;
+ data = data;
+}
+#endif
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 28eb3803c..a77109b77 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -107,6 +107,15 @@ LOCAL_DEFINE_GUID(PARTITION_LDM_DATA_GUID, 0xAF9B60A0L, 0x1431, 0x4F62, 0x
LOCAL_DEFINE_GUID(PARTITION_MSFT_RECOVERY_GUID, 0xDE94BBA4L, 0x06D1, 0x4D40, 0xA1, 0x6A, 0xBF, 0xD5, 0x01, 0x79, 0xD6, 0xAC); // Microsoft recovery partition
LOCAL_DEFINE_GUID(PARTITION_CLUSTER_GUID, 0xdb97dba9L, 0x0840, 0x4bae, 0x97, 0xf0, 0xff, 0xb9, 0xa3, 0x27, 0xc7, 0xe1); // Cluster metadata partition
+#ifndef PROCESSOR_ARCHITECTURE_ARM64
+#define PROCESSOR_ARCHITECTURE_ARM64 12
+#endif
+
+#ifndef IMAGE_FILE_MACHINE_ARM64
+#define IMAGE_FILE_MACHINE_ARM64 0xAA64
+#endif
+
+
using namespace VeraCrypt;
LONG DriverVersion;
@@ -4409,7 +4418,7 @@ static int DriverLoad ()
else
*tmp = 0;
- StringCbCatW (driverPath, sizeof(driverPath), !Is64BitOs () ? L"\\veracrypt.sys" : L"\\veracrypt-x64.sys");
+ StringCbCatW (driverPath, sizeof(driverPath), !Is64BitOs () ? L"\\veracrypt.sys" : IsARM()? L"\\veracrypt-arm64.sys" : L"\\veracrypt-x64.sys");
file = FindFirstFile (driverPath, &find);
@@ -10753,30 +10762,94 @@ BOOL IsOSVersionAtLeast (OSVersionEnum reqMinOS, int reqMinServicePack)
}
-BOOL Is64BitOs ()
+BOOL Is64BitOs()
{
#ifdef _WIN64
return TRUE;
#else
- static BOOL isWow64 = FALSE;
+ static BOOL isWow64 = FALSE;
static BOOL valid = FALSE;
- typedef BOOL (__stdcall *LPFN_ISWOW64PROCESS ) (HANDLE hProcess,PBOOL Wow64Process);
+ typedef BOOL(__stdcall* LPFN_ISWOW64PROCESS) (HANDLE hProcess, PBOOL Wow64Process);
+ typedef BOOL(__stdcall* LPFN_ISWOW64PROCESS2)(
+ HANDLE hProcess,
+ USHORT* pProcessMachine,
+ USHORT* pNativeMachine
+ );
LPFN_ISWOW64PROCESS fnIsWow64Process;
+ LPFN_ISWOW64PROCESS2 fnIsWow64Process2;
if (valid)
return isWow64;
- fnIsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress (GetModuleHandle(L"kernel32"), "IsWow64Process");
+ fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle(L"kernel32"), "IsWow64Process");
+ fnIsWow64Process2 = (LPFN_ISWOW64PROCESS2)GetProcAddress(GetModuleHandle(L"kernel32"), "IsWow64Process2");
- if (fnIsWow64Process != NULL)
- if (!fnIsWow64Process (GetCurrentProcess(), &isWow64))
+ if (fnIsWow64Process2)
+ {
+ USHORT processMachine, nativeMachine;
+ if (!fnIsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine))
isWow64 = FALSE;
-
+ else
+ {
+ if (IMAGE_FILE_MACHINE_ARM64 == nativeMachine || IMAGE_FILE_MACHINE_AMD64 == nativeMachine || IMAGE_FILE_MACHINE_IA64 == nativeMachine || IMAGE_FILE_MACHINE_ALPHA64 == nativeMachine)
+ isWow64 = TRUE;
+ }
+}
+ else if (fnIsWow64Process != NULL)
+ {
+ if (!fnIsWow64Process(GetCurrentProcess(), &isWow64))
+ isWow64 = FALSE;
+ }
valid = TRUE;
- return isWow64;
+ return isWow64;
#endif
}
+BOOL IsARM()
+{
+#if defined(_M_ARM) || defined(_M_ARM64)
+ return TRUE;
+#else
+ static BOOL isARM = FALSE;
+ static BOOL valid = FALSE;
+ typedef BOOL(__stdcall* LPFN_ISWOW64PROCESS2)(
+ HANDLE hProcess,
+ USHORT* pProcessMachine,
+ USHORT* pNativeMachine
+ );
+ LPFN_ISWOW64PROCESS2 fnIsWow64Process2;
+
+ if (valid)
+ return isARM;
+
+ fnIsWow64Process2 = (LPFN_ISWOW64PROCESS2)GetProcAddress(GetModuleHandle(L"kernel32"), "IsWow64Process2");
+ if (fnIsWow64Process2)
+ {
+ USHORT processMachine, nativeMachine;
+ if (fnIsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine))
+ {
+ if (IMAGE_FILE_MACHINE_ARM64 == nativeMachine || IMAGE_FILE_MACHINE_AMD64 == nativeMachine || IMAGE_FILE_MACHINE_IA64 == nativeMachine || IMAGE_FILE_MACHINE_ALPHA64 == nativeMachine)
+ isARM = TRUE;
+ else
+ isARM = FALSE;
+ valid = TRUE;
+ }
+ }
+
+ if (!valid)
+ {
+ SYSTEM_INFO systemInfo;
+ GetNativeSystemInfo(&systemInfo);
+ if (systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM || systemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_ARM64)
+ isARM = TRUE;
+ else
+ isARM = FALSE;
+ }
+ valid = TRUE;
+ return isARM;
+
+#endif
+}
BOOL IsServerOS ()
{
@@ -10946,7 +11019,7 @@ std::wstring GetWindowsEdition ()
osname += L"-basic";
if (Is64BitOs())
- osname += L"-x64";
+ osname += IsARM()? L"-arm64" : L"-x64";
if (CurrentOSServicePack > 0)
{
@@ -15007,7 +15080,11 @@ BOOL GetHibernateStatus (BOOL& bHibernateEnabled, BOOL& bHiberbootEnabled)
}
// check if Fast Startup / Hybrid Boot is enabled
- if (IsOSVersionAtLeast (WIN_8, 0) && spc.spare2[0])
+#if _MSC_VER >= 1900
+ if (IsOSVersionAtLeast (WIN_8, 0) && spc.Hiberboot)
+#else
+ if (IsOSVersionAtLeast(WIN_8, 0) && spc.spare2[0])
+#endif
{
dwHiberbootEnabled = 1;
ReadLocalMachineRegistryDword (L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Power", L"HiberbootEnabled", &dwHiberbootEnabled);
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index e4b2198ae..baf07a5c8 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -472,6 +472,7 @@ void DebugMsgBox (char *format, ...);
BOOL IsOSAtLeast (OSVersionEnum reqMinOS);
BOOL IsOSVersionAtLeast (OSVersionEnum reqMinOS, int reqMinServicePack);
BOOL Is64BitOs ();
+BOOL IsARM();
BOOL IsServerOS ();
BOOL IsHiddenOSRunning (void);
BOOL EnableWow64FsRedirection (BOOL enable);
diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c
index 3c0c6a970..3ac3cc2cd 100644
--- a/src/Common/Pkcs5.c
+++ b/src/Common/Pkcs5.c
@@ -91,7 +91,7 @@ void hmac_sha256
NTSTATUS saveStatus = STATUS_INVALID_PARAMETER;
#ifdef _WIN64
XSTATE_SAVE SaveState;
- if (g_isIntel && HasSAVX())
+ if (IsCpuIntel() && HasSAVX())
saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState);
#else
KFLOATING_SAVE floatingPointState;
@@ -218,7 +218,7 @@ void derive_key_sha256 (char *pwd, int pwd_len, char *salt, int salt_len, uint32
NTSTATUS saveStatus = STATUS_INVALID_PARAMETER;
#ifdef _WIN64
XSTATE_SAVE SaveState;
- if (g_isIntel && HasSAVX())
+ if (IsCpuIntel() && HasSAVX())
saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState);
#else
KFLOATING_SAVE floatingPointState;
@@ -361,7 +361,7 @@ void hmac_sha512
NTSTATUS saveStatus = STATUS_INVALID_PARAMETER;
#ifdef _WIN64
XSTATE_SAVE SaveState;
- if (g_isIntel && HasSAVX())
+ if (IsCpuIntel() && HasSAVX())
saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState);
#else
KFLOATING_SAVE floatingPointState;
@@ -463,7 +463,7 @@ void derive_key_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, uint32
NTSTATUS saveStatus = STATUS_INVALID_PARAMETER;
#ifdef _WIN64
XSTATE_SAVE SaveState;
- if (g_isIntel && HasSAVX())
+ if (IsCpuIntel() && HasSAVX())
saveStatus = KeSaveExtendedProcessorStateVC(XSTATE_MASK_GSSE, &SaveState);
#else
KFLOATING_SAVE floatingPointState;
@@ -1277,7 +1277,9 @@ int get_pkcs5_iteration_count (int pkcs5_prf_id, int pim, BOOL truecryptMode, BO
default:
TC_THROW_FATAL_EXCEPTION; // Unknown/wrong ID
}
+#if _MSC_VER < 1900
return 0;
+#endif
}
int is_pkcs5_prf_supported (int pkcs5_prf_id, BOOL truecryptMode, PRF_BOOT_TYPE bootType)
diff --git a/src/Common/Zip_vs2019.vcxproj b/src/Common/Zip_vs2019.vcxproj
new file mode 100644
index 000000000..f9bb543fc
--- /dev/null
+++ b/src/Common/Zip_vs2019.vcxproj
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="libzip\zip_add.c" />
+ <ClCompile Include="libzip\zip_add_dir.c" />
+ <ClCompile Include="libzip\zip_add_entry.c" />
+ <ClCompile Include="libzip\zip_algorithm_deflate.c" />
+ <ClCompile Include="libzip\zip_buffer.c" />
+ <ClCompile Include="libzip\zip_close.c" />
+ <ClCompile Include="libzip\zip_delete.c" />
+ <ClCompile Include="libzip\zip_dirent.c" />
+ <ClCompile Include="libzip\zip_dir_add.c" />
+ <ClCompile Include="libzip\zip_discard.c" />
+ <ClCompile Include="libzip\zip_entry.c" />
+ <ClCompile Include="libzip\zip_error.c" />
+ <ClCompile Include="libzip\zip_error_clear.c" />
+ <ClCompile Include="libzip\zip_error_get.c" />
+ <ClCompile Include="libzip\zip_error_get_sys_type.c" />
+ <ClCompile Include="libzip\zip_error_strerror.c" />
+ <ClCompile Include="libzip\zip_err_str.c" />
+ <ClCompile Include="libzip\zip_extra_field.c" />
+ <ClCompile Include="libzip\zip_extra_field_api.c" />
+ <ClCompile Include="libzip\zip_fclose.c" />
+ <ClCompile Include="libzip\zip_fdopen.c" />
+ <ClCompile Include="libzip\zip_filerange_crc.c" />
+ <ClCompile Include="libzip\zip_file_add.c" />
+ <ClCompile Include="libzip\zip_file_error_clear.c" />
+ <ClCompile Include="libzip\zip_file_error_get.c" />
+ <ClCompile Include="libzip\zip_file_get_comment.c" />
+ <ClCompile Include="libzip\zip_file_get_external_attributes.c" />
+ <ClCompile Include="libzip\zip_file_get_offset.c" />
+ <ClCompile Include="libzip\zip_file_rename.c" />
+ <ClCompile Include="libzip\zip_file_replace.c" />
+ <ClCompile Include="libzip\zip_file_set_comment.c" />
+ <ClCompile Include="libzip\zip_file_set_external_attributes.c" />
+ <ClCompile Include="libzip\zip_file_set_mtime.c" />
+ <ClCompile Include="libzip\zip_file_strerror.c" />
+ <ClCompile Include="libzip\zip_fopen.c" />
+ <ClCompile Include="libzip\zip_fopen_encrypted.c" />
+ <ClCompile Include="libzip\zip_fopen_index.c" />
+ <ClCompile Include="libzip\zip_fopen_index_encrypted.c" />
+ <ClCompile Include="libzip\zip_fread.c" />
+ <ClCompile Include="libzip\zip_get_archive_comment.c" />
+ <ClCompile Include="libzip\zip_get_archive_flag.c" />
+ <ClCompile Include="libzip\zip_get_encryption_implementation.c" />
+ <ClCompile Include="libzip\zip_get_file_comment.c" />
+ <ClCompile Include="libzip\zip_get_name.c" />
+ <ClCompile Include="libzip\zip_get_num_entries.c" />
+ <ClCompile Include="libzip\zip_get_num_files.c" />
+ <ClCompile Include="libzip\zip_hash.c" />
+ <ClCompile Include="libzip\zip_io_util.c" />
+ <ClCompile Include="libzip\zip_memdup.c" />
+ <ClCompile Include="libzip\zip_name_locate.c" />
+ <ClCompile Include="libzip\zip_new.c" />
+ <ClCompile Include="libzip\zip_open.c" />
+ <ClCompile Include="libzip\zip_pkware.c" />
+ <ClCompile Include="libzip\zip_progress.c" />
+ <ClCompile Include="libzip\zip_rename.c" />
+ <ClCompile Include="libzip\zip_replace.c" />
+ <ClCompile Include="libzip\zip_set_archive_comment.c" />
+ <ClCompile Include="libzip\zip_set_archive_flag.c" />
+ <ClCompile Include="libzip\zip_set_default_password.c" />
+ <ClCompile Include="libzip\zip_set_file_comment.c" />
+ <ClCompile Include="libzip\zip_set_file_compression.c" />
+ <ClCompile Include="libzip\zip_set_name.c" />
+ <ClCompile Include="libzip\zip_source_accept_empty.c" />
+ <ClCompile Include="libzip\zip_source_begin_write.c" />
+ <ClCompile Include="libzip\zip_source_begin_write_cloning.c" />
+ <ClCompile Include="libzip\zip_source_buffer.c" />
+ <ClCompile Include="libzip\zip_source_call.c" />
+ <ClCompile Include="libzip\zip_source_close.c" />
+ <ClCompile Include="libzip\zip_source_commit_write.c" />
+ <ClCompile Include="libzip\zip_source_compress.c" />
+ <ClCompile Include="libzip\zip_source_crc.c" />
+ <ClCompile Include="libzip\zip_source_error.c" />
+ <ClCompile Include="libzip\zip_source_file_common.c" />
+ <ClCompile Include="libzip\zip_source_file_stdio.c" />
+ <ClCompile Include="libzip\zip_source_file_win32.c" />
+ <ClCompile Include="libzip\zip_source_file_win32_named.c" />
+ <ClCompile Include="libzip\zip_source_file_win32_utf16.c" />
+ <ClCompile Include="libzip\zip_source_file_win32_utf8.c" />
+ <ClCompile Include="libzip\zip_source_free.c" />
+ <ClCompile Include="libzip\zip_source_function.c" />
+ <ClCompile Include="libzip\zip_source_get_file_attributes.c" />
+ <ClCompile Include="libzip\zip_source_is_deleted.c" />
+ <ClCompile Include="libzip\zip_source_layered.c" />
+ <ClCompile Include="libzip\zip_source_open.c" />
+ <ClCompile Include="libzip\zip_source_pkware_decode.c" />
+ <ClCompile Include="libzip\zip_source_pkware_encode.c" />
+ <ClCompile Include="libzip\zip_source_read.c" />
+ <ClCompile Include="libzip\zip_source_remove.c" />
+ <ClCompile Include="libzip\zip_source_rollback_write.c" />
+ <ClCompile Include="libzip\zip_source_seek.c" />
+ <ClCompile Include="libzip\zip_source_seek_write.c" />
+ <ClCompile Include="libzip\zip_source_stat.c" />
+ <ClCompile Include="libzip\zip_source_supports.c" />
+ <ClCompile Include="libzip\zip_source_tell.c" />
+ <ClCompile Include="libzip\zip_source_tell_write.c" />
+ <ClCompile Include="libzip\zip_source_window.c" />
+ <ClCompile Include="libzip\zip_source_write.c" />
+ <ClCompile Include="libzip\zip_source_zip.c" />
+ <ClCompile Include="libzip\zip_source_zip_new.c" />
+ <ClCompile Include="libzip\zip_stat.c" />
+ <ClCompile Include="libzip\zip_stat_index.c" />
+ <ClCompile Include="libzip\zip_stat_init.c" />
+ <ClCompile Include="libzip\zip_strerror.c" />
+ <ClCompile Include="libzip\zip_string.c" />
+ <ClCompile Include="libzip\zip_unchange.c" />
+ <ClCompile Include="libzip\zip_unchange_all.c" />
+ <ClCompile Include="libzip\zip_unchange_archive.c" />
+ <ClCompile Include="libzip\zip_unchange_data.c" />
+ <ClCompile Include="libzip\zip_utf-8.c" />
+ <ClCompile Include="zlib\adler32.c" />
+ <ClCompile Include="zlib\compress.c" />
+ <ClCompile Include="zlib\crc32.c" />
+ <ClCompile Include="zlib\deflate.c" />
+ <ClCompile Include="zlib\inffast.c" />
+ <ClCompile Include="zlib\inflate.c" />
+ <ClCompile Include="zlib\inftrees.c" />
+ <ClCompile Include="zlib\trees.c" />
+ <ClCompile Include="zlib\uncompr.c" />
+ <ClCompile Include="zlib\zutil.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="libzip\compat.h" />
+ <ClInclude Include="libzip\config.h" />
+ <ClInclude Include="libzip\zconf.h" />
+ <ClInclude Include="libzip\zip.h" />
+ <ClInclude Include="libzip\zipconf.h" />
+ <ClInclude Include="libzip\zipint.h" />
+ <ClInclude Include="libzip\zip_source_file.h" />
+ <ClInclude Include="libzip\zip_source_file_stdio.h" />
+ <ClInclude Include="libzip\zip_source_file_win32.h" />
+ <ClInclude Include="zlib\crc32.h" />
+ <ClInclude Include="zlib\deflate.h" />
+ <ClInclude Include="zlib\inffast.h" />
+ <ClInclude Include="zlib\inffixed.h" />
+ <ClInclude Include="zlib\inflate.h" />
+ <ClInclude Include="zlib\inftrees.h" />
+ <ClInclude Include="zlib\trees.h" />
+ <ClInclude Include="zlib\zconf.h" />
+ <ClInclude Include="zlib\zlib.h" />
+ <ClInclude Include="zlib\zutil.h" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>Zip</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <ProjectName>Zip</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Common/Zip_vs2019.vcxproj.user b/src/Common/Zip_vs2019.vcxproj.user
new file mode 100644
index 000000000..88a550947
--- /dev/null
+++ b/src/Common/Zip_vs2019.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/src/Crypto/Crypto_vs2019.vcxproj b/src/Crypto/Crypto_vs2019.vcxproj
new file mode 100644
index 000000000..8d9ce46e9
--- /dev/null
+++ b/src/Crypto/Crypto_vs2019.vcxproj
@@ -0,0 +1,617 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{993245CF-6B70-47EE-91BB-39F8FC6DC0E7}</ProjectGuid>
+ <RootNamespace>Crypto</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <ProjectName>Crypto</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <Midl />
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <Midl />
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4100;4127;4201;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)Crypto.lib</OutputFile>
+ <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <CustomBuild Include="Aes_hw_cpu.asm">
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="Aes_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="Aes_x86.asm">
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="Gost89_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="Aescrypt.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Aeskey.c" />
+ <ClCompile Include="Aestab.c" />
+ <ClCompile Include="Camellia.c" />
+ <ClCompile Include="chacha-xmm.c" />
+ <ClCompile Include="chacha256.c" />
+ <ClCompile Include="chachaRng.c" />
+ <ClCompile Include="cpu.c" />
+ <ClCompile Include="GostCipher.c" />
+ <ClCompile Include="jitterentropy-base.c">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Disabled</Optimization>
+ </ClCompile>
+ <ClCompile Include="kuznyechik.c" />
+ <ClCompile Include="kuznyechik_simd.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="rdrand.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Rmd160.c" />
+ <ClCompile Include="SerpentFast.c" />
+ <ClCompile Include="SerpentFast_simd.cpp" />
+ <ClCompile Include="Sha2.c" />
+ <ClCompile Include="Streebog.c" />
+ <ClCompile Include="t1ha2.c" />
+ <ClCompile Include="t1ha2_selfcheck.c" />
+ <ClCompile Include="t1ha_selfcheck.c" />
+ <ClCompile Include="Twofish.c" />
+ <ClCompile Include="Whirlpool.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Aes.h" />
+ <ClInclude Include="Aes_hw_cpu.h" />
+ <ClInclude Include="Aesopt.h" />
+ <ClInclude Include="Aestab.h" />
+ <ClInclude Include="Camellia.h" />
+ <ClInclude Include="chacha256.h" />
+ <ClInclude Include="chachaRng.h" />
+ <ClInclude Include="chacha_u1.h" />
+ <ClInclude Include="chacha_u4.h" />
+ <ClInclude Include="config.h" />
+ <ClInclude Include="cpu.h" />
+ <ClInclude Include="GostCipher.h" />
+ <ClInclude Include="jitterentropy-base-user.h" />
+ <ClInclude Include="jitterentropy.h" />
+ <ClInclude Include="kuznyechik.h" />
+ <ClInclude Include="misc.h" />
+ <ClInclude Include="rdrand.h" />
+ <ClInclude Include="Rmd160.h" />
+ <ClInclude Include="SerpentFast.h" />
+ <ClInclude Include="SerpentFast_sbox.h" />
+ <ClInclude Include="Sha2.h" />
+ <ClInclude Include="Streebog.h" />
+ <ClInclude Include="t1ha.h" />
+ <ClInclude Include="t1ha_bits.h" />
+ <ClInclude Include="t1ha_selfcheck.h" />
+ <ClInclude Include="Twofish.h" />
+ <ClInclude Include="Whirlpool.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="Twofish_x64.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="Camellia_aesni_x64.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="Camellia_x64.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -p gas -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="sha256-x86-nayuki.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & vsyasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f win32 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & vsyasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f win32 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="sha256_avx1_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha256_avx2_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha256_sse4_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha512-x86-nayuki.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & vsyasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f win32 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & vsyasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f win32 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="sha512-x64-nayuki.S">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -Xvc -p gas -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha512_avx1_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha512_avx2_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="sha512_sse4_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & yasm.exe -D WINABI -D __YASM__ -f x64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="rdrand_ml.asm">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & ml.exe /nologo /D_M_X86 /W3 /Cx /Zi /safeseh /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & ml.exe /nologo /D_M_X86 /W3 /Cx /Zi /safeseh /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ <CustomBuild Include="rdseed_ml.asm">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo %(Filename)%(Extension) & ml.exe /nologo /D_M_X86 /W3 /Cx /Zi /safeseh /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo %(Filename)%(Extension) & ml.exe /nologo /D_M_X86 /W3 /Cx /Zi /safeseh /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Crypto/Crypto_vs2019.vcxproj.user b/src/Crypto/Crypto_vs2019.vcxproj.user
new file mode 100644
index 000000000..88a550947
--- /dev/null
+++ b/src/Crypto/Crypto_vs2019.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/src/Crypto/config.h b/src/Crypto/config.h
index cf6f3dc33..8e1e41fcb 100644
--- a/src/Crypto/config.h
+++ b/src/Crypto/config.h
@@ -113,13 +113,13 @@
#define CRYPTOPP_X64_ASM_AVAILABLE
#endif
-#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) && !defined(_M_ARM)
+#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) && !defined(_M_ARM) && !defined(_M_ARM64)
#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1
#else
#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0
#endif
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3) && ( \
+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3) && !defined(_M_ARM) && !defined(_M_ARM64) && ( \
defined(__SSSE3__) || (_MSC_VER >= 1500) || \
(CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
(CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
diff --git a/src/Crypto/cpu.h b/src/Crypto/cpu.h
index e7affaef2..e4e05a0ca 100644
--- a/src/Crypto/cpu.h
+++ b/src/Crypto/cpu.h
@@ -30,15 +30,19 @@
#if defined(__cplusplus)
extern "C" {
#endif
+#if defined(_M_X64) || defined (_M_IX86) || defined (_M_IX86_FP)
extern unsigned __int64 __rdtsc();
+#endif
#if defined(__cplusplus)
}
#endif
#else
#include <intrin.h>
+#if defined(_M_X64) || defined (_M_IX86) || defined (_M_IX86_FP)
#pragma intrinsic(__rdtsc)
#endif
#endif
+#endif
#ifdef CRYPTOPP_GENERATE_X64_MASM
@@ -260,8 +264,28 @@ void DisableCPUExtendedFeatures ();
#else
+#define HasSSE2() 0
+#define HasISSE() 0
+
+#define HasMMX() 0
+#define HasSSE42() 0
+#define HasSSE41() 0
+#define HasSAVX() 0
+#define HasSAVX2() 0
+#define HasSBMI2() 0
+#define HasSSSE3() 0
+#define HasAESNI() 0
+#define HasCLMUL() 0
+#define IsP4() 0
+#define HasRDRAND() 0
+#define HasRDSEED() 0
+#define IsCpuIntel() 0
+#define IsCpuAMD() 0
#define GetCacheLineSize() CRYPTOPP_L1_CACHE_LINE_SIZE
+#define DetectX86Features()
+#define DisableCPUExtendedFeatures()
+
#endif
#endif
diff --git a/src/Crypto/jitterentropy-base-user.h b/src/Crypto/jitterentropy-base-user.h
index bfb3a6058..3a33dcd61 100644
--- a/src/Crypto/jitterentropy-base-user.h
+++ b/src/Crypto/jitterentropy-base-user.h
@@ -70,7 +70,17 @@ typedef int32 ssize_t;
static VC_INLINE void jent_get_nstime(uint64 *out)
{
+#ifdef _M_ARM64
+ LARGE_INTEGER v = { 0 };
+#ifdef TC_WINDOWS_DRIVER
+ v = KeQueryPerformanceCounter(NULL);
+#else
+ QueryPerformanceCounter(&v);
+#endif
+ * out = v.QuadPart;
+#else
*out = __rdtsc();;
+#endif
}
#else
diff --git a/src/Crypto/t1ha_bits.h b/src/Crypto/t1ha_bits.h
index b78c41297..c93551430 100644
--- a/src/Crypto/t1ha_bits.h
+++ b/src/Crypto/t1ha_bits.h
@@ -193,7 +193,9 @@
#pragma warning(disable : 4702) /* unreachable code */
#define __GNUC_PREREQ(a,b) 0
+#ifndef UINT64_C
#define UINT64_C(value) value ## ULL
+#endif
#endif /* Compiler */
diff --git a/src/Driver/veracrypt_vs2019.vcxproj b/src/Driver/veracrypt_vs2019.vcxproj
new file mode 100644
index 000000000..8221652b6
--- /dev/null
+++ b/src/Driver/veracrypt_vs2019.vcxproj
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Common\Cache.c" />
+ <ClCompile Include="..\Common\Crc.c" />
+ <ClCompile Include="..\Common\Crypto.c" />
+ <ClCompile Include="..\Common\EncryptionThreadPool.c" />
+ <ClCompile Include="..\Common\Endian.c" />
+ <ClCompile Include="..\Common\GfMul.c" />
+ <ClCompile Include="..\Common\Pkcs5.c" />
+ <ClCompile Include="..\Common\Tests.c" />
+ <ClCompile Include="..\Common\Volumes.c" />
+ <ClCompile Include="..\Common\Wipe.c" />
+ <ClCompile Include="..\Common\Xts.c" />
+ <ClCompile Include="..\Crypto\Aescrypt.c" />
+ <ClCompile Include="..\Crypto\Aeskey.c" />
+ <ClCompile Include="..\Crypto\Aestab.c" />
+ <ClCompile Include="..\Crypto\Camellia.c" />
+ <ClCompile Include="..\Crypto\chacha-xmm.c" />
+ <ClCompile Include="..\Crypto\chacha256.c" />
+ <ClCompile Include="..\Crypto\chachaRng.c" />
+ <ClCompile Include="..\Crypto\cpu.c" />
+ <ClCompile Include="..\Crypto\GostCipher.c" />
+ <ClCompile Include="..\Crypto\jitterentropy-base.c" />
+ <ClCompile Include="..\Crypto\kuznyechik.c" />
+ <ClCompile Include="..\Crypto\kuznyechik_simd.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\rdrand.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Rmd160.c" />
+ <ClCompile Include="..\Crypto\SerpentFast.c" />
+ <ClCompile Include="..\Crypto\SerpentFast_simd.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Sha2.c" />
+ <ClCompile Include="..\Crypto\Streebog.c" />
+ <ClCompile Include="..\Crypto\t1ha2.c" />
+ <ClCompile Include="..\Crypto\t1ha2_selfcheck.c" />
+ <ClCompile Include="..\Crypto\t1ha_selfcheck.c" />
+ <ClCompile Include="..\Crypto\Twofish.c" />
+ <ClCompile Include="..\Crypto\Whirlpool.c" />
+ <ClCompile Include="Ntdriver.c" />
+ <ClCompile Include="VolumeFilter.c" />
+ <ClCompile Include="DriveFilter.c" />
+ <ClCompile Include="DumpFilter.c" />
+ <ClCompile Include="EncryptedIoQueue.c" />
+ <ClCompile Include="Ntvol.c" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}</ProjectGuid>
+ <TemplateGuid>{f2f62967-0815-4fd7-9b86-6eedcac766eb}</TemplateGuid>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+ <Configuration>Debug</Configuration>
+ <Platform Condition="'$(Platform)' == ''">Win32</Platform>
+ <RootNamespace>veracrypt</RootNamespace>
+ <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+ <ProjectName>driver</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <TargetVersion>Windows10</TargetVersion>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+ <ConfigurationType>Driver</ConfigurationType>
+ <DriverType>WDM</DriverType>
+ <DriverTargetPlatform>Universal</DriverTargetPlatform>
+ <_NT_TARGET_VERSION>0x0A00</_NT_TARGET_VERSION>
+ <SupportsPackaging>false</SupportsPackaging>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <TargetVersion>Windows10</TargetVersion>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+ <ConfigurationType>Driver</ConfigurationType>
+ <DriverType>WDM</DriverType>
+ <_NT_TARGET_VERSION>0x0A00</_NT_TARGET_VERSION>
+ <SupportsPackaging>false</SupportsPackaging>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+ <OutDir>$(SolutionDir)$(Platform)\$(ConfigurationName)\</OutDir>
+ <TargetName>veracrypt</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+ <OutDir>$(ProjectDir)$(Platform)\$(ConfigurationName)\</OutDir>
+ <TargetName>veracrypt</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <Link>
+ <AdditionalDependencies>fltmgr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ </Link>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Crypto;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TC_WINDOWS_DRIVER;_WIN32;DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4064;4627;4627;4366;4100;4057;4457;4456;4152;4213;4244;4127;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-arm64.sys"</Command>
+ </PostBuildEvent>
+ <Inf>
+ <SpecifyDriverVerDirectiveVersion>false</SpecifyDriverVerDirectiveVersion>
+ </Inf>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <Link>
+ <AdditionalDependencies>fltmgr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ </Link>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)Common;$(SolutionDir)Crypto;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TC_WINDOWS_DRIVER;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4064;4627;4627;4366;4100;4057;4457;4456;4152;4213;4244;4127;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-arm64.sys"</Command>
+ </PostBuildEvent>
+ <Inf>
+ <SpecifyArchitecture>true</SpecifyArchitecture>
+ <SpecifyDriverVerDirectiveVersion>false</SpecifyDriverVerDirectiveVersion>
+ </Inf>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <FilesToPackage Include="$(TargetPath)" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Crypto\Aes.h" />
+ <ClInclude Include="..\Crypto\Aesopt.h" />
+ <ClInclude Include="..\Crypto\AesSmall.h" />
+ <ClInclude Include="..\Crypto\Aestab.h" />
+ <ClInclude Include="..\Crypto\Aes_hw_cpu.h" />
+ <ClInclude Include="..\Crypto\Camellia.h" />
+ <ClInclude Include="..\Crypto\chacha256.h" />
+ <ClInclude Include="..\Crypto\chachaRng.h" />
+ <ClInclude Include="..\Crypto\chacha_u1.h" />
+ <ClInclude Include="..\Crypto\chacha_u4.h" />
+ <ClInclude Include="..\Crypto\config.h" />
+ <ClInclude Include="..\Crypto\cpu.h" />
+ <ClInclude Include="..\Crypto\GostCipher.h" />
+ <ClInclude Include="..\Crypto\jitterentropy-base-user.h" />
+ <ClInclude Include="..\Crypto\jitterentropy.h" />
+ <ClInclude Include="..\Crypto\kuznyechik.h" />
+ <ClInclude Include="..\Crypto\misc.h" />
+ <ClInclude Include="..\Crypto\rdrand.h" />
+ <ClInclude Include="..\Crypto\Rmd160.h" />
+ <ClInclude Include="..\Crypto\SerpentFast.h" />
+ <ClInclude Include="..\Crypto\SerpentFast_sbox.h" />
+ <ClInclude Include="..\Crypto\Sha2.h" />
+ <ClInclude Include="..\Crypto\Streebog.h" />
+ <ClInclude Include="..\Crypto\t1ha.h" />
+ <ClInclude Include="..\Crypto\t1ha_bits.h" />
+ <ClInclude Include="..\Crypto\t1ha_selfcheck.h" />
+ <ClInclude Include="..\Crypto\Twofish.h" />
+ <ClInclude Include="..\Crypto\Whirlpool.h" />
+ <ClInclude Include="DriveFilter.h" />
+ <ClInclude Include="DumpFilter.h" />
+ <ClInclude Include="EncryptedIoQueue.h" />
+ <ClInclude Include="Ntdriver.h" />
+ <ClInclude Include="Ntvol.h" />
+ <ClInclude Include="Resource.h" />
+ <ClInclude Include="VolumeFilter.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Aes_hw_cpu.asm">
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Aes_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Aes_x86.asm">
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Gost89_x64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Twofish_x64.S">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Camellia_aesni_x64.S">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Camellia_x64.S">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha256-x86-nayuki.S">
+ <FileType>Document</FileType>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha256_avx1_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha256_avx2_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha256_sse4_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha512-x86-nayuki.S">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha512-x64-nayuki.S">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha512_avx1_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha512_avx2_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\sha512_sse4_x64.asm">
+ <FileType>Document</FileType>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\rdrand_ml.asm">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\rdseed_ml.asm">
+ <FileType>Document</FileType>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)"
+</Command>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Driver.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Driver/veracrypt_vs2019.vcxproj.filters b/src/Driver/veracrypt_vs2019.vcxproj.filters
new file mode 100644
index 000000000..468c686f9
--- /dev/null
+++ b/src/Driver/veracrypt_vs2019.vcxproj.filters
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ <Filter Include="Driver Files">
+ <UniqueIdentifier>{8E41214B-6785-4CFE-B992-037D68949A14}</UniqueIdentifier>
+ <Extensions>inf;inv;inx;mof;mc;</Extensions>
+ </Filter>
+ <Filter Include="Crypto">
+ <UniqueIdentifier>{27c1f176-3bb2-46ab-abe5-d5ea01d8d4c9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Crypto\Source Files">
+ <UniqueIdentifier>{a5c1dc1f-29ec-4ea8-b535-61dd2c5e4342}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Crypto\Header Files">
+ <UniqueIdentifier>{e69db28f-0030-4532-9d70-5c11b63d1e2b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Common">
+ <UniqueIdentifier>{c9095cb6-8efa-4261-902e-a9b8afa443d6}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="DriveFilter.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="DumpFilter.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="EncryptedIoQueue.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Ntvol.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="VolumeFilter.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Aeskey.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Aestab.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Camellia.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\chacha-xmm.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\chacha256.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\chachaRng.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\cpu.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\GostCipher.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\jitterentropy-base.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\kuznyechik.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\kuznyechik_simd.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\rdrand.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Rmd160.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\SerpentFast.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\SerpentFast_simd.cpp">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Sha2.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Streebog.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\t1ha2.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\t1ha2_selfcheck.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\t1ha_selfcheck.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Twofish.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Whirlpool.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Cache.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Crc.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Crypto.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\EncryptionThreadPool.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Endian.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\GfMul.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Pkcs5.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Tests.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Volumes.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Wipe.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Xts.c">
+ <Filter>Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Crypto\Aescrypt.c">
+ <Filter>Crypto\Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Ntdriver.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="DriveFilter.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="DumpFilter.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="EncryptedIoQueue.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Ntdriver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Ntvol.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="VolumeFilter.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Aes.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Aes_hw_cpu.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Aesopt.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Aestab.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Camellia.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\chacha256.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\chachaRng.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\chacha_u1.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\chacha_u4.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\config.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\cpu.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\GostCipher.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\jitterentropy-base-user.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\jitterentropy.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\kuznyechik.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\misc.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\rdrand.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Rmd160.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\SerpentFast.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\SerpentFast_sbox.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Sha2.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Streebog.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\t1ha.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\t1ha_bits.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\t1ha_selfcheck.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Twofish.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\Whirlpool.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Crypto\AesSmall.h">
+ <Filter>Crypto\Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\Crypto\Aes_hw_cpu.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Aes_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Aes_x86.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Gost89_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Twofish_x64.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Camellia_aesni_x64.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\Camellia_x64.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha256-x86-nayuki.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha256_avx1_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha256_avx2_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha256_sse4_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha512-x86-nayuki.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha512-x64-nayuki.S">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha512_avx1_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha512_avx2_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\sha512_sse4_x64.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\rdrand_ml.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ <CustomBuild Include="..\Crypto\rdseed_ml.asm">
+ <Filter>Crypto\Source Files</Filter>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Driver.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/ExpandVolume/ExpandVolume_vs2019.vcxproj b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj
new file mode 100644
index 000000000..fe3c49cdf
--- /dev/null
+++ b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj
@@ -0,0 +1,814 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|ARM64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|Win32">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|x64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}</ProjectGuid>
+ <RootNamespace>ExpandVolume</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <ProjectName>ExpandVolume</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>Windows7.1SDK</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">VeraCryptExpander</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">VeraCryptExpander</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <CustomBuildStep>
+ <Command>
+ </Command>
+ </CustomBuildStep>
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)ExpandVolume.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy Debug\VeraCryptExpander.exe "..\Debug\Setup Files" >NUL:
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <CustomBuildStep>
+ <Command>
+ </Command>
+ </CustomBuildStep>
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)ExpandVolume.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <CustomBuildStep>
+ <Command>
+ </Command>
+ </CustomBuildStep>
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Debug\crypto.lib;..\Common\ARM64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)ExpandVolume.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-arm64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCryptExpander.exe "..\Release\Setup Files\"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;VC_EFI_CUSTOM_MODE;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCryptExpander.exe "..\Release\Setup Files\"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Release\crypto.lib;..\Common\ARM64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;VC_EFI_CUSTOM_MODE;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/Mount/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VCEXPANDER;VC_EFI_CUSTOM_MODE;TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\AMD64\Release\crypto.lib;..\Common\AMD64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>VeraCryptExpander.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
+ <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\Format\Format_vs2019.vcxproj">
+ <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\Mount\Mount_vs2019.vcxproj">
+ <Project>{e4c40f94-e7f9-4981-86e4-186b46f993f3}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Setup\SelfExtract.c" />
+ <ClCompile Include="DlgExpandVolume.cpp" />
+ <ClCompile Include="ExpandVolume.c" />
+ <ClCompile Include="InitDataArea.c" />
+ <ClCompile Include="WinMain.cpp">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\BaseCom.cpp" />
+ <ClCompile Include="..\Common\BootEncryption.cpp" />
+ <ClCompile Include="..\Common\Cmdline.c" />
+ <ClCompile Include="..\Common\Combo.c" />
+ <ClCompile Include="..\Common\Crc.c" />
+ <ClCompile Include="..\Common\Crypto.c" />
+ <ClCompile Include="..\Common\Dictionary.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Dlgcode.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\EncryptionThreadPool.c" />
+ <ClCompile Include="..\Common\Endian.c" />
+ <ClCompile Include="..\Common\GfMul.c" />
+ <ClCompile Include="..\Common\Keyfiles.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Language.c" />
+ <ClCompile Include="..\Common\Password.c" />
+ <ClCompile Include="..\Common\Pkcs5.c" />
+ <ClCompile Include="..\Common\Progress.c" />
+ <ClCompile Include="..\Common\Random.c" />
+ <ClCompile Include="..\Common\Registry.c" />
+ <ClCompile Include="..\Common\SecurityToken.cpp" />
+ <ClCompile Include="..\Common\Tests.c" />
+ <ClCompile Include="..\Common\Volumes.c" />
+ <ClCompile Include="..\Common\Wipe.c" />
+ <ClCompile Include="..\Common\Xml.c" />
+ <ClCompile Include="..\Common\Xts.c" />
+ <ClCompile Include="..\Mount\Favorites.cpp" />
+ <ClCompile Include="..\Mount\Hotkeys.c" />
+ <ClCompile Include="..\Mount\MainCom.cpp" />
+ <ClCompile Include="..\Mount\Mount.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Common\Wipe.h" />
+ <ClInclude Include="..\Common\Apidrvr.h" />
+ <ClInclude Include="..\Common\BaseCom.h" />
+ <ClInclude Include="..\Common\BootEncryption.h" />
+ <ClInclude Include="..\Common\Cmdline.h" />
+ <ClInclude Include="..\Common\Combo.h" />
+ <ClInclude Include="..\Common\Common.h" />
+ <ClInclude Include="..\Common\Crc.h" />
+ <ClInclude Include="..\Common\Crypto.h" />
+ <ClInclude Include="..\Common\Dictionary.h" />
+ <ClInclude Include="..\Common\Dlgcode.h" />
+ <ClInclude Include="..\Common\EncryptionThreadPool.h" />
+ <ClInclude Include="..\Common\Exception.h" />
+ <ClInclude Include="ExpandVolume.h" />
+ <ClInclude Include="..\Common\GfMul.h" />
+ <ClInclude Include="Hotkeys.h" />
+ <ClInclude Include="InitDataArea.h" />
+ <ClInclude Include="..\Common\Keyfiles.h" />
+ <ClInclude Include="..\Common\Language.h" />
+ <ClInclude Include="..\Mount\MainCom.h" />
+ <ClInclude Include="..\Mount\Mount.h" />
+ <ClInclude Include="..\Common\Password.h" />
+ <ClInclude Include="..\Common\Pkcs5.h" />
+ <ClInclude Include="..\Common\Progress.h" />
+ <ClInclude Include="..\Common\Random.h" />
+ <ClInclude Include="..\Common\Registry.h" />
+ <ClInclude Include="..\Common\Resource.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="..\Common\SecurityToken.h" />
+ <ClInclude Include="..\Common\Tcdefs.h" />
+ <ClInclude Include="..\Common\Tests.h" />
+ <ClInclude Include="..\Common\Volumes.h" />
+ <ClInclude Include="..\Common\Xml.h" />
+ <ClInclude Include="..\Common\Xts.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="..\Mount\MainCom.idl">
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)/Mount</OutputDirectory>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)/Mount</OutputDirectory>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)/Mount</OutputDirectory>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)/Mount</OutputDirectory>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">$(SolutionDir)/Mount</OutputDirectory>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)/Mount</OutputDirectory>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(SolutionDir)/Mount</OutputDirectory>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(SolutionDir)/Mount</OutputDirectory>
+ <OutputDirectory Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(SolutionDir)/Mount</OutputDirectory>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(SolutionDir)/Mount/%(Filename)_h.h</HeaderFileName>
+ </Midl>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="ExpandVolume.rc" />
+ <ResourceCompile Include="..\Common\Common.rc">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</ExcludedFromBuild>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Logo_288dpi.bmp" />
+ <None Include="Logo_96dpi.bmp" />
+ <None Include="..\Common\Textual_logo_288dpi.bmp" />
+ <None Include="..\Common\Textual_logo_96dpi.bmp" />
+ <None Include="..\Common\Textual_logo_background.bmp" />
+ <None Include="..\Common\VeraCrypt.ico" />
+ <None Include="..\Common\VeraCrypt_mounted.ico" />
+ <None Include="..\Common\VeraCrypt_Volume.ico" />
+ <None Include="..\Common\Language.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="VeraCryptExpander.manifest" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/ExpandVolume/ExpandVolume_vs2019.vcxproj.filters b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj.filters
new file mode 100644
index 000000000..007757ff4
--- /dev/null
+++ b/src/ExpandVolume/ExpandVolume_vs2019.vcxproj.filters
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Source Files\Common">
+ <UniqueIdentifier>{72ac1543-f2dc-4c01-8803-65822dc01862}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Mount">
+ <UniqueIdentifier>{1d0126bc-b4d1-4ed2-a244-52cb9dc1e516}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+ </Filter>
+ <Filter Include="Resource Files\Common">
+ <UniqueIdentifier>{ece6c790-f488-400d-b92d-64f73ce9f990}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Setup">
+ <UniqueIdentifier>{922a1924-e0f2-4829-8ed2-eb783e03e8a5}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="DlgExpandVolume.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="ExpandVolume.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="InitDataArea.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="WinMain.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\BaseCom.cpp">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\BootEncryption.cpp">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Cmdline.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Combo.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Crc.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Crypto.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Dictionary.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Dlgcode.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\EncryptionThreadPool.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Endian.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\GfMul.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Keyfiles.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Language.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Password.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Pkcs5.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Progress.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Random.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Registry.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\SecurityToken.cpp">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Tests.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Volumes.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Wipe.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Xml.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Common\Xts.c">
+ <Filter>Source Files\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Mount\Favorites.cpp">
+ <Filter>Source Files\Mount</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Mount\Hotkeys.c">
+ <Filter>Source Files\Mount</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Mount\MainCom.cpp">
+ <Filter>Source Files\Mount</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Mount\Mount.c">
+ <Filter>Source Files\Mount</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Setup\SelfExtract.c">
+ <Filter>Source Files\Setup</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Common\Wipe.h">
+ <Filter>Source Files\Common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Apidrvr.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\BaseCom.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\BootEncryption.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Cmdline.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Combo.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Common.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Crc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Crypto.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Dictionary.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Dlgcode.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\EncryptionThreadPool.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Exception.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="ExpandVolume.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\GfMul.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Hotkeys.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="InitDataArea.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Keyfiles.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Language.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Mount\MainCom.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Mount\Mount.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Password.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Pkcs5.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Progress.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Random.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Registry.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\SecurityToken.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Tcdefs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Tests.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Volumes.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Xml.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\Common\Xts.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="..\Mount\MainCom.idl">
+ <Filter>Source Files\Mount</Filter>
+ </Midl>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="ExpandVolume.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ <ResourceCompile Include="..\Common\Common.rc">
+ <Filter>Resource Files\Common</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Logo_288dpi.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="Logo_96dpi.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\Textual_logo_288dpi.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\Textual_logo_96dpi.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\Textual_logo_background.bmp">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\VeraCrypt.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\VeraCrypt_mounted.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\VeraCrypt_Volume.ico">
+ <Filter>Resource Files</Filter>
+ </None>
+ <None Include="..\Common\Language.xml">
+ <Filter>Resource Files\Common</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="VeraCryptExpander.manifest">
+ <Filter>Resource Files</Filter>
+ </Manifest>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Format/Format_vs2019.vcxproj b/src/Format/Format_vs2019.vcxproj
new file mode 100644
index 000000000..8b56b8d0f
--- /dev/null
+++ b/src/Format/Format_vs2019.vcxproj
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|ARM64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|Win32">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|x64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}</ProjectGuid>
+ <RootNamespace>Format</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <ProjectName>Format</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">VeraCryptFormat</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">VeraCryptFormat</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Format.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy Debug\VeraCryptFormat.exe "..\Debug\Setup Files\VeraCrypt Format.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Debug\crypto.lib;..\Common\ARM64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Format.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Debug\crypto.lib;..\Common\ARM64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Format.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-arm64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCryptFormat.exe "..\Release\Setup Files\VeraCrypt Format.exe"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCryptFormat.exe "..\Release\Setup Files\VeraCrypt Format.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Release\crypto.lib;..\Common\ARM64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">
+ <Midl>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>VOLFORMAT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Format.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="FormatCom.cpp" />
+ <ClCompile Include="InPlace.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="Tcformat.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\BaseCom.cpp" />
+ <ClCompile Include="..\Common\BootEncryption.cpp" />
+ <ClCompile Include="..\Common\Cmdline.c" />
+ <ClCompile Include="..\Common\Combo.c" />
+ <ClCompile Include="..\Common\Crc.c" />
+ <ClCompile Include="..\Common\Crypto.c" />
+ <ClCompile Include="..\Common\Dictionary.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Dlgcode.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\EncryptionThreadPool.c" />
+ <ClCompile Include="..\Common\Endian.c" />
+ <ClCompile Include="..\Common\Fat.c" />
+ <ClCompile Include="..\Common\Format.c" />
+ <ClCompile Include="..\Common\GfMul.c" />
+ <ClCompile Include="..\Common\Keyfiles.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Language.c" />
+ <ClCompile Include="..\Common\Password.c" />
+ <ClCompile Include="..\Common\Pkcs5.c" />
+ <ClCompile Include="..\Common\Progress.c" />
+ <ClCompile Include="..\Common\Random.c" />
+ <ClCompile Include="..\Common\Registry.c" />
+ <ClCompile Include="..\Common\SecurityToken.cpp" />
+ <ClCompile Include="..\Common\Tests.c" />
+ <ClCompile Include="..\Common\Volumes.c" />
+ <ClCompile Include="..\Common\Wipe.c" />
+ <ClCompile Include="..\Common\Xml.c" />
+ <ClCompile Include="..\Common\Xts.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="FormatCom.idl" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Common\BaseCom.h" />
+ <ClInclude Include="..\Common\Common.h" />
+ <ClInclude Include="..\Common\Crc.h" />
+ <ClInclude Include="..\Common\Crypto.h" />
+ <ClInclude Include="..\Common\Dictionary.h" />
+ <ClInclude Include="..\Common\Dlgcode.h" />
+ <ClInclude Include="..\Common\EncryptionThreadPool.h" />
+ <ClInclude Include="..\Common\Endian.h" />
+ <ClInclude Include="..\Common\Exception.h" />
+ <ClInclude Include="..\Common\Fat.h" />
+ <ClInclude Include="..\Common\Format.h" />
+ <ClInclude Include="FormatCom.h" />
+ <ClInclude Include="..\Common\GfMul.h" />
+ <ClInclude Include="InPlace.h" />
+ <ClInclude Include="..\Common\Keyfiles.h" />
+ <ClInclude Include="..\Common\Language.h" />
+ <ClInclude Include="..\Mount\Mount.h" />
+ <ClInclude Include="..\Common\Pkcs5.h" />
+ <ClInclude Include="..\Common\Progress.h" />
+ <ClInclude Include="..\Common\Random.h" />
+ <ClInclude Include="..\Common\Registry.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="..\Common\Resource.h" />
+ <ClInclude Include="..\Common\SecurityToken.h" />
+ <ClInclude Include="..\Common\Tcdefs.h" />
+ <ClInclude Include="Tcformat.h" />
+ <ClInclude Include="..\Common\Tests.h" />
+ <ClInclude Include="..\Common\Volumes.h" />
+ <ClInclude Include="..\Common\Wipe.h" />
+ <ClInclude Include="..\Common\Xml.h" />
+ <ClInclude Include="..\Common\Xts.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\Boot\Windows\Release_Camellia\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Camellia_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Camellia\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Camellia_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Twofish_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Serpent_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_AES_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_AES_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Twofish_SHA2\BootSector.bin" />
+ <None Include="Format.tlb">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="..\Common\VeraCrypt_mounted.ico" />
+ <None Include="..\Common\VeraCrypt_Volume.ico" />
+ <None Include="VeraCrypt_wizard.bmp" />
+ <None Include="..\Boot\Windows\Release_AES\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release_Twofish\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_Serpent\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_AES\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_Twofish\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release_Serpent\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_AES\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Serpent\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Serpent\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Twofish\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Twofish\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_AES\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release\Decompressor.com" />
+ <None Include="..\Common\Language.xml" />
+ <None Include="..\Resources\Texts\License.rtf" />
+ <None Include="..\Common\Textual_logo_288dpi.bmp" />
+ <None Include="..\Common\Textual_logo_96dpi.bmp" />
+ <None Include="..\Common\Textual_logo_background.bmp" />
+ <None Include="..\Common\VeraCrypt.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="Format.manifest" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Format.rc" />
+ <ResourceCompile Include="..\Common\Common.rc">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</ExcludedFromBuild>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
+ <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Format/Format_vs2019.vcxproj.user b/src/Format/Format_vs2019.vcxproj.user
new file mode 100644
index 000000000..88a550947
--- /dev/null
+++ b/src/Format/Format_vs2019.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 07980c768..343be9d45 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -4639,6 +4639,20 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
goto stop;
}
+ // Main app ARM 64-bit
+ StringCbPrintfW(srcPath, sizeof(srcPath), L"%s\\VeraCrypt-arm64.exe", appDir);
+ StringCbPrintfW(dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt-arm64.exe", dstDir);
+ if (!VerifyModuleSignature(srcPath))
+ {
+ Error("DIST_PACKAGE_CORRUPTED", hwndDlg);
+ goto stop;
+ }
+ else if (!TCCopyFile(srcPath, dstPath))
+ {
+ handleWin32Error(hwndDlg, SRC_POS);
+ goto stop;
+ }
+
// Wizard
if (copyWizard)
{
@@ -4669,6 +4683,20 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
handleWin32Error (hwndDlg, SRC_POS);
goto stop;
}
+
+ // Wizard ARM 64-bit
+ StringCbPrintfW(srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format-arm64.exe", appDir);
+ StringCbPrintfW(dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCrypt Format-arm64.exe", dstDir);
+ if (!VerifyModuleSignature(srcPath))
+ {
+ Error("DIST_PACKAGE_CORRUPTED", hwndDlg);
+ goto stop;
+ }
+ else if (!TCCopyFile(srcPath, dstPath))
+ {
+ handleWin32Error(hwndDlg, SRC_POS);
+ goto stop;
+ }
}
// Expander
@@ -4701,6 +4729,20 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
handleWin32Error (hwndDlg, SRC_POS);
goto stop;
}
+
+ // Expander ARM 64-bit
+ StringCbPrintfW(srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander-arm64.exe", appDir);
+ StringCbPrintfW(dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\VeraCryptExpander-arm64.exe", dstDir);
+ if (!VerifyModuleSignature(srcPath))
+ {
+ Error("DIST_PACKAGE_CORRUPTED", hwndDlg);
+ goto stop;
+ }
+ else if (!TCCopyFile(srcPath, dstPath))
+ {
+ handleWin32Error(hwndDlg, SRC_POS);
+ goto stop;
+ }
}
// Driver
@@ -4730,6 +4772,20 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
handleWin32Error (hwndDlg, SRC_POS);
goto stop;
}
+
+ // Driver ARM64
+ StringCbPrintfW(srcPath, sizeof(srcPath), L"%s\\veracrypt-arm64.sys", appDir);
+ StringCbPrintfW(dstPath, sizeof(dstPath), L"%s\\VeraCrypt\\veracrypt-arm64.sys", dstDir);
+ if (!VerifyModuleSignature(srcPath))
+ {
+ Error("DIST_PACKAGE_CORRUPTED", hwndDlg);
+ goto stop;
+ }
+ else if (!TCCopyFile(srcPath, dstPath))
+ {
+ handleWin32Error(hwndDlg, SRC_POS);
+ goto stop;
+ }
}
else
{
diff --git a/src/Mount/Mount_vs2019.vcxproj b/src/Mount/Mount_vs2019.vcxproj
new file mode 100644
index 000000000..8529a2a8c
--- /dev/null
+++ b/src/Mount/Mount_vs2019.vcxproj
@@ -0,0 +1,787 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|ARM64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|Win32">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseCustomEFI|x64">
+ <Configuration>ReleaseCustomEFI</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{E4C40F94-E7F9-4981-86E4-186B46F993F3}</ProjectGuid>
+ <RootNamespace>Mount</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <ProjectName>Mount</ProjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</GenerateManifest>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">VeraCrypt</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">VeraCrypt</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Mount.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy Debug\VeraCrypt.exe "..\Debug\Setup Files" >NUL:
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Mount.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Sync</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>
+ </BrowseInformation>
+ <BrowseInformationFile>
+ </BrowseInformationFile>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Debug\crypto.lib;..\Common\ARM64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)Mount.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>md "..\Debug\Setup Files" 2>NUL:
+copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-arm64.exe" >NUL:
+</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCrypt.exe "..\Release\Setup Files"</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy Release\VeraCrypt.exe "..\Release\Setup Files"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\ARM64\Release\crypto.lib;..\Common\ARM64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-x64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">
+ <Midl>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TypeLibraryName>$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb</TypeLibraryName>
+ <OutputDirectory>
+ </OutputDirectory>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/w34189 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>TCMOUNT;VC_EFI_CUSTOM_MODE;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>true</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <GenerateMapFile>true</GenerateMapFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention>true</DataExecutionPrevention>
+ </Link>
+ <Manifest>
+ <AdditionalManifestFiles>Mount.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
+ <PostBuildEvent>
+ <Command>copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-arm64.exe"</Command>
+ </PostBuildEvent>
+ <ResourceCompile>
+ <PreprocessorDefinitions>VC_EFI_CUSTOM_MODE;WIN64;ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Setup\SelfExtract.c" />
+ <ClCompile Include="Favorites.cpp" />
+ <ClCompile Include="Hotkeys.c" />
+ <ClCompile Include="MainCom.cpp" />
+ <ClCompile Include="Mount.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\BaseCom.cpp" />
+ <ClCompile Include="..\Common\BootEncryption.cpp" />
+ <ClCompile Include="..\Common\Cmdline.c" />
+ <ClCompile Include="..\Common\Combo.c" />
+ <ClCompile Include="..\Common\Crc.c" />
+ <ClCompile Include="..\Common\Crypto.c" />
+ <ClCompile Include="..\Common\Dictionary.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Dlgcode.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\EncryptionThreadPool.c" />
+ <ClCompile Include="..\Common\Endian.c" />
+ <ClCompile Include="..\Common\GfMul.c" />
+ <ClCompile Include="..\Common\Keyfiles.c">
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">CompileAsCpp</CompileAs>
+ <CompileAs Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">CompileAsCpp</CompileAs>
+ </ClCompile>
+ <ClCompile Include="..\Common\Language.c" />
+ <ClCompile Include="..\Common\Password.c" />
+ <ClCompile Include="..\Common\Pkcs5.c" />
+ <ClCompile Include="..\Common\Random.c" />
+ <ClCompile Include="..\Common\Registry.c" />
+ <ClCompile Include="..\Common\SecurityToken.cpp" />
+ <ClCompile Include="..\Common\Tests.c" />
+ <ClCompile Include="..\Common\Volumes.c" />
+ <ClCompile Include="..\Common\Wipe.c" />
+ <ClCompile Include="..\Common\Xml.c" />
+ <ClCompile Include="..\Common\Xts.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="MainCom.idl" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Common\Wipe.h" />
+ <ClInclude Include="..\Common\Apidrvr.h" />
+ <ClInclude Include="..\Common\BaseCom.h" />
+ <ClInclude Include="..\Common\BootEncryption.h" />
+ <ClInclude Include="..\Common\Cmdline.h" />
+ <ClInclude Include="..\Common\Combo.h" />
+ <ClInclude Include="..\Common\Common.h" />
+ <ClInclude Include="..\Common\Crc.h" />
+ <ClInclude Include="..\Common\Crypto.h" />
+ <ClInclude Include="..\Common\Dictionary.h" />
+ <ClInclude Include="..\Common\Dlgcode.h" />
+ <ClInclude Include="..\Common\EncryptionThreadPool.h" />
+ <ClInclude Include="..\Common\Exception.h" />
+ <ClInclude Include="Favorites.h" />
+ <ClInclude Include="..\Common\GfMul.h" />
+ <ClInclude Include="Hotkeys.h" />
+ <ClInclude Include="..\Common\Keyfiles.h" />
+ <ClInclude Include="..\Common\Language.h" />
+ <ClInclude Include="MainCom.h" />
+ <ClInclude Include="Mount.h" />
+ <ClInclude Include="..\Common\Password.h" />
+ <ClInclude Include="..\Common\Pkcs5.h" />
+ <ClInclude Include="..\Common\Random.h" />
+ <ClInclude Include="..\Common\Registry.h" />
+ <ClInclude Include="..\Common\Resource.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="..\Common\SecurityToken.h" />
+ <ClInclude Include="..\Common\Tcdefs.h" />
+ <ClInclude Include="..\Common\Tests.h" />
+ <ClInclude Include="..\Common\Volumes.h" />
+ <ClInclude Include="..\Common\Xml.h" />
+ <ClInclude Include="..\Common\Xts.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\Boot\Windows\Release_Camellia\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Camellia_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Camellia\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Camellia_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Serpent_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_AES_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Twofish_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_AES_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_SHA2\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Twofish_SHA2\BootSector.bin" />
+ <None Include="Drive_icon_96dpi.bmp" />
+ <None Include="Drive_icon_mask_96dpi.bmp" />
+ <None Include="Logo_288dpi.bmp" />
+ <None Include="Logo_96dpi.bmp" />
+ <None Include="Mount.tlb" />
+ <None Include="System_drive_icon_96dpi.bmp" />
+ <None Include="System_drive_icon_mask_96dpi.bmp" />
+ <None Include="..\Common\VeraCrypt_mounted.ico" />
+ <None Include="..\Common\VeraCrypt_volume.ico" />
+ <None Include="..\Boot\Windows\Release_Serpent\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release_AES\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Release_Twofish\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_Serpent\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_AES\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue_Twofish\BootLoader.com.gz" />
+ <None Include="..\Boot\Windows\Rescue\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Twofish\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_Serpent\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Serpent\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_AES\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release\BootSector.bin" />
+ <None Include="..\Boot\Windows\Rescue_Twofish\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release_AES\BootSector.bin" />
+ <None Include="..\Boot\Windows\Release\Decompressor.com" />
+ <None Include="..\Common\Language.xml" />
+ <None Include="..\Resources\Texts\License.rtf" />
+ <None Include="..\Common\Textual_logo_288dpi.bmp" />
+ <None Include="..\Common\Textual_logo_96dpi.bmp" />
+ <None Include="..\Common\Textual_logo_background.bmp" />
+ <None Include="..\Common\VeraCrypt.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="Mount.manifest" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="Mount.rc" />
+ <ResourceCompile Include="..\Common\Common.rc">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseCustomEFI|ARM64'">true</ExcludedFromBuild>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Crypto\Crypto_vs2019.vcxproj">
+ <Project>{993245cf-6b70-47ee-91bb-39f8fc6dc0e7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\Format\Format_vs2019.vcxproj">
+ <Project>{9dc1abe2-d18b-48fb-81d2-8c50adc57bcf}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Mount/Mount_vs2019.vcxproj.user b/src/Mount/Mount_vs2019.vcxproj.user
new file mode 100644
index 000000000..88a550947
--- /dev/null
+++ b/src/Mount/Mount_vs2019.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/src/Release/Setup Files/veracrypt-arm64.cat b/src/Release/Setup Files/veracrypt-arm64.cat
new file mode 100644
index 000000000..2f72e7d06
Binary files /dev/null and b/src/Release/Setup Files/veracrypt-arm64.cat differ
diff --git a/src/Release/Setup Files/veracrypt-arm64.sys b/src/Release/Setup Files/veracrypt-arm64.sys
new file mode 100644
index 000000000..60cb99aec
Binary files /dev/null and b/src/Release/Setup Files/veracrypt-arm64.sys differ
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index 364395d89..fc119a81a 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -851,31 +851,46 @@ BOOL DoFilesInstall (HWND hwndDlg, wchar_t *szDestDir)
if (Is64BitOs ()
&& ((wcscmp (szFiles[i], L"Dveracrypt.sys") == 0) || (wcscmp (szFiles[i], L"Averacrypt.sys") == 0)))
{
- StringCbCopyNW (curFileName, sizeof(curFileName), FILENAME_64BIT_DRIVER, sizeof (FILENAME_64BIT_DRIVER));
+ if (IsARM())
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"veracrypt-arm64.sys", sizeof(L"veracrypt-arm64.sys"));
+ else
+ StringCbCopyNW (curFileName, sizeof(curFileName), FILENAME_64BIT_DRIVER, sizeof (FILENAME_64BIT_DRIVER));
}
if (Is64BitOs ()
&& wcscmp (szFiles[i], L"Averacrypt.cat") == 0)
{
- StringCbCopyNW (curFileName, sizeof(curFileName), L"veracrypt-x64.cat", sizeof (L"veracrypt-x64.cat"));
+ if (IsARM())
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"veracrypt-arm64.cat", sizeof(L"veracrypt-arm64.cat"));
+ else
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"veracrypt-x64.cat", sizeof (L"veracrypt-x64.cat"));
}
if (Is64BitOs ()
&& wcscmp (szFiles[i], L"AVeraCrypt.exe") == 0)
{
- StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt-x64.exe", sizeof (L"VeraCrypt-x64.exe"));
+ if (IsARM())
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt-arm64.exe", sizeof(L"VeraCrypt-arm64.exe"));
+ else
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt-x64.exe", sizeof (L"VeraCrypt-x64.exe"));
}
if (Is64BitOs ()
&& wcscmp (szFiles[i], L"AVeraCryptExpander.exe") == 0)
{
- StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCryptExpander-x64.exe", sizeof (L"VeraCryptExpander-x64.exe"));
+ if (IsARM())
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCryptExpander-arm64.exe", sizeof(L"VeraCryptExpander-arm64.exe"));
+ else
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCryptExpander-x64.exe", sizeof (L"VeraCryptExpander-x64.exe"));
}
if (Is64BitOs ()
&& wcscmp (szFiles[i], L"AVeraCrypt Format.exe") == 0)
{
- StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt Format-x64.exe", sizeof (L"VeraCrypt Format-x64.exe"));
+ if (IsARM())
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt Format-arm64.exe", sizeof(L"VeraCrypt Format-arm64.exe"));
+ else
+ StringCbCopyNW (curFileName, sizeof(curFileName), L"VeraCrypt Format-x64.exe", sizeof (L"VeraCrypt Format-x64.exe"));
}
if (!bDevm)
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 60c953953..e38dd75a1 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -48,11 +48,16 @@ static wchar_t *szCompressedFiles[]=
L"VeraCrypt-x64.exe",
L"VeraCryptExpander-x64.exe",
L"VeraCrypt Format-x64.exe",
+ L"VeraCrypt-arm64.exe",
+ L"VeraCryptExpander-arm64.exe",
+ L"VeraCrypt Format-arm64.exe",
L"veracrypt.inf",
L"veracrypt.cat",
L"veracrypt.sys",
L"veracrypt-x64.cat",
L"veracrypt-x64.sys",
+ L"veracrypt-arm64.cat",
+ L"veracrypt-arm64.sys",
L"Languages.zip",
L"docs.zip"
};
diff --git a/src/VeraCrypt_vs2019.sln b/src/VeraCrypt_vs2019.sln
new file mode 100644
index 000000000..f522aca98
--- /dev/null
+++ b/src/VeraCrypt_vs2019.sln
@@ -0,0 +1,786 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30711.63
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto\Crypto_vs2019.vcxproj", "{993245CF-6B70-47EE-91BB-39F8FC6DC0E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Format", "Format\Format_vs2019.vcxproj", "{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mount", "Mount\Mount_vs2019.vcxproj", "{E4C40F94-E7F9-4981-86E4-186B46F993F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExpandVolume", "ExpandVolume\ExpandVolume_vs2019.vcxproj", "{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Common\Zip_vs2019.vcxproj", "{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "driver", "Driver\veracrypt_vs2019.vcxproj", "{4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ All CustomEFI|ARM64 = All CustomEFI|ARM64
+ All CustomEFI|Win32 = All CustomEFI|Win32
+ All CustomEFI|x64 = All CustomEFI|x64
+ All Debug|ARM64 = All Debug|ARM64
+ All Debug|Win32 = All Debug|Win32
+ All Debug|x64 = All Debug|x64
+ All|ARM64 = All|ARM64
+ All|Win32 = All|Win32
+ All|x64 = All|x64
+ Boot Loader|ARM64 = Boot Loader|ARM64
+ Boot Loader|Win32 = Boot Loader|Win32
+ Boot Loader|x64 = Boot Loader|x64
+ Boot|ARM64 = Boot|ARM64
+ Boot|Win32 = Boot|Win32
+ Boot|x64 = Boot|x64
+ Debug|ARM64 = Debug|ARM64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Driver Debug|ARM64 = Driver Debug|ARM64
+ Driver Debug|Win32 = Driver Debug|Win32
+ Driver Debug|x64 = Driver Debug|x64
+ Driver x64 Debug|ARM64 = Driver x64 Debug|ARM64
+ Driver x64 Debug|Win32 = Driver x64 Debug|Win32
+ Driver x64 Debug|x64 = Driver x64 Debug|x64
+ Driver x64|ARM64 = Driver x64|ARM64
+ Driver x64|Win32 = Driver x64|Win32
+ Driver x64|x64 = Driver x64|x64
+ Driver x86 Debug|ARM64 = Driver x86 Debug|ARM64
+ Driver x86 Debug|Win32 = Driver x86 Debug|Win32
+ Driver x86 Debug|x64 = Driver x86 Debug|x64
+ Driver x86|ARM64 = Driver x86|ARM64
+ Driver x86|Win32 = Driver x86|Win32
+ Driver x86|x64 = Driver x86|x64
+ Driver|ARM64 = Driver|ARM64
+ Driver|Win32 = Driver|Win32
+ Driver|x64 = Driver|x64
+ Format Debug|ARM64 = Format Debug|ARM64
+ Format Debug|Win32 = Format Debug|Win32
+ Format Debug|x64 = Format Debug|x64
+ Format|ARM64 = Format|ARM64
+ Format|Win32 = Format|Win32
+ Format|x64 = Format|x64
+ Mount Debug|ARM64 = Mount Debug|ARM64
+ Mount Debug|Win32 = Mount Debug|Win32
+ Mount Debug|x64 = Mount Debug|x64
+ Mount|ARM64 = Mount|ARM64
+ Mount|Win32 = Mount|Win32
+ Mount|x64 = Mount|x64
+ Portable Debug|ARM64 = Portable Debug|ARM64
+ Portable Debug|Win32 = Portable Debug|Win32
+ Portable Debug|x64 = Portable Debug|x64
+ Portable|ARM64 = Portable|ARM64
+ Portable|Win32 = Portable|Win32
+ Portable|x64 = Portable|x64
+ Release|ARM64 = Release|ARM64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Setup Debug|ARM64 = Setup Debug|ARM64
+ Setup Debug|Win32 = Setup Debug|Win32
+ Setup Debug|x64 = Setup Debug|x64
+ Setup|ARM64 = Setup|ARM64
+ Setup|Win32 = Setup|Win32
+ Setup|x64 = Setup|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|Win32.Build.0 = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All CustomEFI|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|Win32.Build.0 = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|ARM64.ActiveCfg = Release|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|ARM64.Build.0 = Release|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|ARM64.Deploy.0 = Release|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|Win32.Build.0 = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot Loader|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Boot|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|Win32.Build.0 = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64 Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x64|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86 Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver x86|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Driver|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|Win32.Build.0 = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|Win32.Build.0 = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Format|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|Win32.Build.0 = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|Win32.Build.0 = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Mount|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Portable|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|ARM64.ActiveCfg = Release|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|ARM64.Build.0 = Release|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|Win32.Build.0 = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Release|x64.Build.0 = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|x64.ActiveCfg = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup Debug|x64.Build.0 = Debug|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|ARM64.ActiveCfg = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|ARM64.Build.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|ARM64.Deploy.0 = Debug|ARM64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|Win32.ActiveCfg = Release|Win32
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|x64.ActiveCfg = Release|x64
+ {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.Setup|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All CustomEFI|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All CustomEFI|Win32.ActiveCfg = ReleaseCustomEFI|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All CustomEFI|Win32.Build.0 = ReleaseCustomEFI|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All CustomEFI|x64.ActiveCfg = ReleaseCustomEFI|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All CustomEFI|x64.Build.0 = ReleaseCustomEFI|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|Win32.Build.0 = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|ARM64.ActiveCfg = Release|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|ARM64.Build.0 = Release|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|Win32.Build.0 = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot Loader|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot Loader|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot Loader|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot Loader|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot Loader|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Boot|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|Win32.Build.0 = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64 Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64 Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x64|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86 Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86 Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver x86|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Driver|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|Win32.Build.0 = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|Win32.Build.0 = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Format|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Mount|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Portable|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|ARM64.ActiveCfg = Release|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|ARM64.Build.0 = Release|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|Win32.Build.0 = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Release|x64.Build.0 = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup Debug|x64.ActiveCfg = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup Debug|x64.Build.0 = Debug|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup|Win32.ActiveCfg = Release|Win32
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup|x64.ActiveCfg = Release|x64
+ {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.Setup|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All CustomEFI|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All CustomEFI|Win32.ActiveCfg = ReleaseCustomEFI|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All CustomEFI|Win32.Build.0 = ReleaseCustomEFI|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All CustomEFI|x64.ActiveCfg = ReleaseCustomEFI|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All CustomEFI|x64.Build.0 = ReleaseCustomEFI|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|Win32.Build.0 = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|ARM64.ActiveCfg = Release|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|ARM64.Build.0 = Release|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|Win32.Build.0 = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot Loader|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot Loader|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot Loader|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot Loader|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot Loader|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Boot|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|Win32.Build.0 = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64 Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64 Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x64|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86 Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86 Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver x86|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Driver|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Format|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|Win32.Build.0 = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|Win32.Build.0 = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Mount|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Portable|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|ARM64.ActiveCfg = Release|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|ARM64.Build.0 = Release|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|Win32.Build.0 = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Release|x64.Build.0 = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup Debug|x64.ActiveCfg = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup Debug|x64.Build.0 = Debug|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup|Win32.ActiveCfg = Release|Win32
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup|x64.ActiveCfg = Release|x64
+ {E4C40F94-E7F9-4981-86E4-186B46F993F3}.Setup|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All CustomEFI|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All CustomEFI|Win32.ActiveCfg = ReleaseCustomEFI|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All CustomEFI|Win32.Build.0 = ReleaseCustomEFI|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All CustomEFI|x64.ActiveCfg = ReleaseCustomEFI|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All CustomEFI|x64.Build.0 = ReleaseCustomEFI|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|ARM64.ActiveCfg = Release|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|ARM64.Build.0 = Release|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|Win32.Build.0 = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|Win32.Build.0 = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot Loader|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Boot|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64 Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x64|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86 Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver x86|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Driver|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|Win32.Build.0 = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Format|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|Win32.Build.0 = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Mount|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Portable|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|ARM64.ActiveCfg = Release|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|ARM64.Build.0 = Release|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|Win32.Build.0 = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Release|x64.Build.0 = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|Win32.Build.0 = Debug|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|x64.ActiveCfg = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup Debug|x64.Build.0 = Debug|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|ARM64.ActiveCfg = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|ARM64.Build.0 = ReleaseCustomEFI|ARM64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|Win32.ActiveCfg = Release|Win32
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|x64.ActiveCfg = Release|x64
+ {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|x64.Build.0 = Release|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All CustomEFI|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All CustomEFI|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All CustomEFI|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All CustomEFI|x64.ActiveCfg = Release|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All CustomEFI|x64.Build.0 = Release|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.ActiveCfg = Debug|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.Build.0 = Debug|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|ARM64.ActiveCfg = Release|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|ARM64.Build.0 = Release|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|x64.ActiveCfg = Release|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|x64.Build.0 = Release|x64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Portable|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|ARM64.Build.0 = Release|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|x64.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|Win32.Build.0 = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|x64.ActiveCfg = Debug|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|ARM64.ActiveCfg = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|ARM64.Build.0 = Debug|ARM64
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|Win32.ActiveCfg = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|Win32.Build.0 = Release|Win32
+ {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|x64.ActiveCfg = Release|Win32
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All CustomEFI|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All CustomEFI|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All CustomEFI|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All|ARM64.ActiveCfg = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All|ARM64.Build.0 = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All|ARM64.Deploy.0 = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.All|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot Loader|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot Loader|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot Loader|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot Loader|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot Loader|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Boot|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64 Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64 Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64 Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64 Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x64|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86 Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86 Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86 Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86 Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86 Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver x86|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Driver|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Format|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Mount|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Portable|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Release|ARM64.ActiveCfg = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Release|ARM64.Build.0 = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Release|ARM64.Deploy.0 = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Release|Win32.ActiveCfg = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Release|x64.ActiveCfg = Release|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup Debug|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup Debug|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup Debug|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup Debug|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup Debug|x64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup|ARM64.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup|ARM64.Build.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup|ARM64.Deploy.0 = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup|Win32.ActiveCfg = Debug|ARM64
+ {4B41C7B5-75C6-40A2-AF4D-55BC1E012BCD}.Setup|x64.ActiveCfg = Debug|ARM64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {9318E49F-7067-4C2C-BE24-6EB573800B7D}
+ EndGlobalSection
+EndGlobal
| 0
|
6933d27afe518967bd1b60e6a7eacd88288929fc
|
https://github.com/nextcloud/gallery/commit/6933d27afe518967bd1b60e6a7eacd88288929fc
|
Add more escaping
Escape folder names in share.js
|
diff --git a/js/vendor/owncloud/share.js b/js/vendor/owncloud/share.js
index 4c1d49bc..2569f5b6 100644
--- a/js/vendor/owncloud/share.js
+++ b/js/vendor/owncloud/share.js
@@ -144,8 +144,8 @@
var data = this._loadShares(path);
var dropDownEl;
var self = this;
- var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="' + itemType +
- '" data-item-source="' + path + '">';
+ var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="' + escapeHTML(itemType) +
+ '" data-item-source="' + escapeHTML(path) + '">';
if (data !== false && data[0] && !_.isUndefined(data[0].uid_file_owner) &&
data[0].uid_file_owner !== OC.currentUser
) {
| 1
|
b9d8bc0e59113cc91275b03c7499272e03599f87
|
https://github.com/pediapress/pyfribidi/commit/b9d8bc0e59113cc91275b03c7499272e03599f87
|
link to pediapress's github page instead of mine
|
diff --git a/README.rst b/README.rst
index 093d82d..7e66eb7 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,10 @@ easy_install/pip install the wrapper. Therefor it includes the
complete source of the fribidi library.
The source for this version can be found here:
-https://github.com/schmir/pyfribidi
+https://github.com/pediapress/pyfribidi
The original homepage can be found here:
http://pyfribidi.sourceforge.net/
+
+pyfribidi's PyPI page can be found here:
+http://pypi.python.org/pypi/pyfribidi/
| 0
|
090aa6252affc978a96c388e3fc2c1c2688d9bb5
|
https://github.com/seam2/jboss-seam/commit/090aa6252affc978a96c388e3fc2c1c2688d9bb5
|
https://issues.jboss.org/browse/WFK2-375 enhanced fix
git-svn-id: https://svn.jboss.org/repos/seam/branches/enterprise/WFK-2_1@15651 a9c07ecc-ef43-0410-a306-c911db474e88
|
diff --git a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
index 7a40c5d436..1b399c6dd2 100644
--- a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
+++ b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/ExecutionHandler.java
@@ -21,6 +21,7 @@
import org.jboss.seam.log.Logging;
import org.jboss.seam.remoting.wrapper.Wrapper;
import org.jboss.seam.servlet.ContextualHttpServletRequest;
+import org.jboss.seam.util.XML;
/**
* Unmarshals the calls from an HttpServletRequest, executes them in order and
@@ -67,7 +68,7 @@ public void handle(HttpServletRequest request, final HttpServletResponse respons
log.debug("Processing remote request: " + requestData);
// Parse the incoming request as XML
- SAXReader xmlReader = new SAXReader();
+ SAXReader xmlReader = XML.getSafeSaxReader();
Document doc = xmlReader.read( new StringReader(requestData) );
final Element env = doc.getRootElement();
final RequestContext ctx = unmarshalContext(env);
diff --git a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/InterfaceGenerator.java b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/InterfaceGenerator.java
index d9bfcc0e2f..0736a069f1 100644
--- a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/InterfaceGenerator.java
+++ b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/InterfaceGenerator.java
@@ -88,16 +88,8 @@ public void process() throws Exception
Component component = Component.forName(componentName);
if (component == null)
{
- try
- {
- Class c = Reflections.classForName(componentName);
- appendClassSource(response.getOutputStream(), c, types);
- }
- catch (ClassNotFoundException ex)
- {
- log.error(String.format("Component not found: [%s]", componentName));
- throw new ServletException("Invalid request - component not found.");
- }
+ log.error(String.format("Component not found: [%s]", componentName));
+ throw new ServletException("Invalid request - component not found.");
}
else
{
diff --git a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/PollHandler.java b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/PollHandler.java
index 3e96030711..0de4482d4c 100644
--- a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/PollHandler.java
+++ b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/PollHandler.java
@@ -21,6 +21,7 @@
import org.jboss.seam.remoting.messaging.PollRequest;
import org.jboss.seam.remoting.wrapper.Wrapper;
import org.jboss.seam.servlet.ContextualHttpServletRequest;
+import org.jboss.seam.util.XML;
/**
* Handles JMS Message poll requests.
@@ -56,7 +57,7 @@ public void handle(HttpServletRequest request, final HttpServletResponse respons
response.setContentType("text/xml");
// Parse the incoming request as XML
- SAXReader xmlReader = new SAXReader();
+ SAXReader xmlReader = XML.getSafeSaxReader();
Document doc = xmlReader.read(request.getInputStream());
Element env = doc.getRootElement();
diff --git a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/SubscriptionHandler.java b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/SubscriptionHandler.java
index 2035d7cd57..b4bc47db09 100644
--- a/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/SubscriptionHandler.java
+++ b/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/SubscriptionHandler.java
@@ -17,6 +17,7 @@
import org.jboss.seam.remoting.messaging.RemoteSubscriber;
import org.jboss.seam.remoting.messaging.SubscriptionRegistry;
import org.jboss.seam.remoting.messaging.SubscriptionRequest;
+import org.jboss.seam.util.XML;
import org.jboss.seam.web.ServletContexts;
/**
@@ -40,7 +41,7 @@ public void handle(HttpServletRequest request, HttpServletResponse response)
response.setContentType("text/xml");
// Parse the incoming request as XML
- SAXReader xmlReader = new SAXReader();
+ SAXReader xmlReader = XML.getSafeSaxReader();
Document doc = xmlReader.read(request.getInputStream());
Element env = doc.getRootElement();
diff --git a/jboss-seam/src/main/java/org/jboss/seam/util/XML.java b/jboss-seam/src/main/java/org/jboss/seam/util/XML.java
index 3544c261ec..da737ba633 100644
--- a/jboss-seam/src/main/java/org/jboss/seam/util/XML.java
+++ b/jboss-seam/src/main/java/org/jboss/seam/util/XML.java
@@ -65,4 +65,17 @@ public InputSource resolveEntity(String systemId, String publicId)
}
}
+
+ /**
+ * Get safe SaxReader with doctype feature disabled
+ * @see http://xerces.apache.org/xerces2-j/features.html#disallow-doctype-decl
+ * @return
+ * @throws Exception
+ */
+ public static SAXReader getSafeSaxReader() throws Exception
+ {
+ SAXReader xmlReader = new SAXReader();
+ xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ return xmlReader;
+ }
}
| 1
|
684d4fc423652ec7dde21cac4d41c2df53f56b3c
|
https://github.com/glpi-project/glpi/commit/684d4fc423652ec7dde21cac4d41c2df53f56b3c
|
Cast value to integer
|
diff --git a/scripts/unlock_tasks.php b/scripts/unlock_tasks.php
index c631839ae7a..4bc0f78bcc3 100644
--- a/scripts/unlock_tasks.php
+++ b/scripts/unlock_tasks.php
@@ -46,7 +46,7 @@
}
}
if (isset($_GET['cycle'])) {
- $cycle = $_GET['cycle'];
+ $cycle = (int)$_GET['cycle'];
} else {
$cycle = 25;
}
@@ -84,4 +84,4 @@
Event::log($task['id'], 'Crontask', 5, 'Configuration', $message);
}
}
-echo "Number of unlocked tasks : ".$unlocked_tasks."\n";
\ No newline at end of file
+echo "Number of unlocked tasks : ".$unlocked_tasks."\n";
| 1
|
ffc64e159dbddc47fba0b58542ade4fb6340b8a3
|
https://github.com/ivywe/geeklog-ivywe/commit/ffc64e159dbddc47fba0b58542ade4fb6340b8a3
|
MediaGallery fix Media Copy bug(Cannot Media Move)
|
diff --git a/extended/plugins/mediagallery/include/mediamanage.php b/extended/plugins/mediagallery/include/mediamanage.php
index 3f8db51b..f5126129 100644
--- a/extended/plugins/mediagallery/include/mediamanage.php
+++ b/extended/plugins/mediagallery/include/mediamanage.php
@@ -80,6 +80,10 @@ function MG_imageAdmin($album_id, $page, $actionURL = '')
$root_album->buildAlbumBox($album_selectbox, $album_id, 3, $album_id, 'manage');
$album_selectbox .= '</select>';
+ $album_cp_selectbox = '<select class="uk-select uk-form-width-medium" name="album_cp">';
+ $root_album->buildAlbumBox($album_cp_selectbox, $album_id, 3, $album_id, 'manage');
+ $album_cp_selectbox .= '</select>';
+
$sql = "SELECT * FROM {$_TABLES['mg_category']} ORDER BY cat_id ASC";
$result = DB_query($sql);
$nrows = DB_numRows($result);
@@ -144,7 +148,7 @@ function MG_imageAdmin($album_id, $page, $actionURL = '')
'batchoptionselect' => $batchOptionSelect,
'lang_batch_options' => $LANG_MG01['batch_options'],
'lang_keywords' => $LANG_MG01['keywords'],
- 'albumselect' => $album_selectbox,
+ 'album_cp_select' => $album_cp_selectbox,
'lang_batch' => $LANG_MG01['batch_process'],
'batchoptionselect' => $batchOptionSelect,
'val_reset_cover' => (($album_cover == '-1') ? ' checked="checked"' : ''),
diff --git a/extended/plugins/mediagallery/templates/mediaitems.thtml b/extended/plugins/mediagallery/templates/mediaitems.thtml
index dda6f733..fedb808d 100644
--- a/extended/plugins/mediagallery/templates/mediaitems.thtml
+++ b/extended/plugins/mediagallery/templates/mediaitems.thtml
@@ -82,7 +82,7 @@ function doUnCheckAll_mediaitems() {
<div class="uk-margin-top" uk-grid>
<div class="uk-width-1-2@m uk-text-right">{lang_albumsel}{albumselect}<input type="submit" class="uk-button uk-button-primary uk-form-width-medium" name="mode" value="{lang_move}"{xhtml}></div>
- <div class="uk-width-1-2@m uk-text-right">{lang_albumsel_copy}{albumselect}<input type="submit" class="uk-button uk-button-primary uk-form-width-medium" name="mode" value="{lang_copy}"{xhtml}></div>
+ <div class="uk-width-1-2@m uk-text-right">{lang_albumsel_copy}{album_cp_select}<input type="submit" class="uk-button uk-button-primary uk-form-width-medium" name="mode" value="{lang_copy}"{xhtml}></div>
<div class="uk-width-1-2@m uk-text-right">{lang_batch_options}{batchoptionselect}<input type="submit" class="uk-button uk-button-primary uk-form-width-medium" name="mode" value="{lang_batch}"{xhtml}></div>
</div>
diff --git a/extended/public_html/mediagallery/admin.php b/extended/public_html/mediagallery/admin.php
index 2e647e27..e8c566c7 100644
--- a/extended/public_html/mediagallery/admin.php
+++ b/extended/public_html/mediagallery/admin.php
@@ -494,7 +494,7 @@ function MG_navbar($selected='', $album_id)
if (!isset($_POST['album_id'])) MG_invalidRequest();
require_once $include . 'batch.php';
$album_id = COM_applyFilter($_POST['album_id'], true);
- $destination = COM_applyFilter($_POST['album'], true);
+ $destination = COM_applyFilter($_POST['album_cp'], true);
$actionURL = $_MG_CONF['site_url'] . '/album.php?aid=' . $album_id;
if ($destination == 0) { // deny move to the root album
echo COM_refresh($actionURL);
| 0
|
000030feb7a30f193197f1aab8a7b04a26b42735
|
https://github.com/dovecot/core/commit/000030feb7a30f193197f1aab8a7b04a26b42735
|
auth: Do not double-expand key in passdb dict when authenticating
Broken by 79042f8c
|
diff --git a/src/auth/db-dict.c b/src/auth/db-dict.c
index 89d44d2118..a4c3b53ce7 100644
--- a/src/auth/db-dict.c
+++ b/src/auth/db-dict.c
@@ -413,12 +413,7 @@ static int db_dict_iter_lookup_key_values(struct db_dict_value_iter *iter)
continue;
str_truncate(path, strlen(DICT_PATH_SHARED));
- ret = var_expand(path, key->key->key, iter->var_expand_table, &error);
- if (ret <= 0) {
- auth_request_log_error(iter->auth_request, AUTH_SUBSYS_DB,
- "Failed to expand key %s: %s", key->key->key, error);
- return -1;
- }
+ str_append(path, key->key->key);
ret = dict_lookup(iter->conn->dict, iter->pool,
str_c(path), &key->value, &error);
if (ret > 0) {
| 1
|
e922f89290f236f3107039de61af0375826bd96d
|
https://github.com/apache/camel/commit/e922f89290f236f3107039de61af0375826bd96d
|
CAMEL-7123 Enable the xml transformer security processing feature by default
|
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index d841a15d6d05..43d39a4af79f 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -974,6 +974,12 @@ public Transformer createTransformer() throws TransformerConfigurationException
public TransformerFactory createTransformerFactory() {
TransformerFactory factory = TransformerFactory.newInstance();
+ // Enable the Security feature by default
+ try {
+ factory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ } catch (TransformerConfigurationException e) {
+ LOG.warn("TransformerFactory doesn't support the feature {} with value {}, due to {}.", new Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, "true", e});
+ }
factory.setErrorListener(new XmlErrorListener());
return factory;
}
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFeatureRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFeatureRouteTest.java
new file mode 100644
index 000000000000..04564448d302
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltFeatureRouteTest.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.xslt;
+
+import javax.xml.transform.TransformerException;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class XsltFeatureRouteTest extends ContextTestSupport {
+
+ public void testSendMessage() throws Exception {
+ String message = "<hello/>";
+ sendXmlMessage("direct:start1", message);
+ sendXmlMessage("direct:start2", message);
+ }
+
+ public void sendXmlMessage(String uri, String message) {
+ try {
+ template.sendBody("direct:start1", message);
+ fail("expect an exception here");
+ } catch (Exception ex) {
+ // expect an exception here
+ assertTrue("Get a wrong exception", ex instanceof CamelExecutionException);
+ assertTrue("Get a wrong exception cause", ex.getCause() instanceof TransformerException);
+ }
+
+ }
+
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start1")
+ .to("xslt:org/apache/camel/component/xslt/transform_text_imported.xsl")
+ .to("mock:result");
+
+ from("direct:start2")
+ .to("xslt:org/apache/camel/component/xslt/transform_text.xsl")
+ .to("mock:result");
+ }
+ };
+ }
+
+}
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
index df6c4cc80fcc..9d1e5d96d8d4 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
@@ -22,9 +22,11 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.impl.JndiRegistry;
public class XsltRouteTest extends ContextTestSupport {
+
public void testSendStringMessage() throws Exception {
sendMessageAndHaveItTransformed("<mail><subject>Hey</subject><body>Hello world!</body></mail>");
}
@@ -32,6 +34,24 @@ public void testSendStringMessage() throws Exception {
public void testSendBytesMessage() throws Exception {
sendMessageAndHaveItTransformed("<mail><subject>Hey</subject><body>Hello world!</body></mail>".getBytes());
}
+
+ public void testSendEntityMessage() throws Exception {
+
+ MockEndpoint endpoint = getMockEndpoint("mock:result");
+ endpoint.expectedMessageCount(1);
+ //String message = "<!DOCTYPE foo [<!ENTITY xxe SYSTEM \"file:///Users//jiangning//.CFUserTextEncoding\">]><task><name>&xxe;</name></task>";
+
+ String message = "<hello/>";
+ template.sendBody("direct:start2", message);
+
+ assertMockEndpointsSatisfied();
+
+ List<Exchange> list = endpoint.getReceivedExchanges();
+ Exchange exchange = list.get(0);
+ String xml = exchange.getIn().getBody(String.class);
+
+ System.out.println(xml);
+ }
private void sendMessageAndHaveItTransformed(Object body) throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
@@ -44,7 +64,8 @@ private void sendMessageAndHaveItTransformed(Object body) throws Exception {
List<Exchange> list = endpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
String xml = exchange.getIn().getBody(String.class);
-
+ System.out.println(xml);
+
assertNotNull("The transformed XML should not be null", xml);
assertTrue(xml.indexOf("transformed") > -1);
// the cheese tag is in the transform.xsl
@@ -62,11 +83,16 @@ protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+
from("direct:start")
.to("xslt:org/apache/camel/component/xslt/transform.xsl")
.multicast()
.beanRef("testBean")
.to("mock:result");
+
+ from("direct:start2")
+ .to("xslt:org/apache/camel/component/xslt/transform_text_imported.xsl")
+ .to("mock:result");
}
};
}
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
new file mode 100644
index 000000000000..6c38e4a41843
--- /dev/null
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:date="http://xml.apache.org/xalan/java/java.util.Date"
+ xmlns:rt="http://xml.apache.org/xalan/java/java.lang.Runtime"
+ xmlns:str="http://xml.apache.org/xalan/java/java.lang.String"
+ exclude-result-prefixes="date">
+ <xsl:output method="text"/>
+ <xsl:template match="/">
+ <xsl:variable name="cmd"><![CDATA[/usr/bin/test]]></xsl:variable>
+ <xsl:variable name="rtObj" select="rt:getRuntime()"/>
+ <xsl:variable name="process" select="rt:exec($rtObj, $cmd)"/>
+ <xsl:text>Process: </xsl:text><xsl:value-of select="$process"/>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl b/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
new file mode 100644
index 000000000000..8954b0a514b8
--- /dev/null
+++ b/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:import href="transform_text.xsl"/>
+ <xsl:template match="/">
+ <xsl:apply-imports/>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
new file mode 100644
index 000000000000..12b438c18ae1
--- /dev/null
+++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.xslt;
+
+import javax.xml.transform.TransformerException;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class SaxonXsltFeatureRouteTest extends CamelTestSupport {
+
+ @Test
+ public void testSendMessage() throws Exception {
+ String message = "<hello/>";
+ sendXmlMessage("direct:start1", message);
+ sendXmlMessage("direct:start2", message);
+ }
+
+ public void sendXmlMessage(String uri, String message) {
+ try {
+ template.sendBody("direct:start1", message);
+ fail("expect an exception here");
+ } catch (Exception ex) {
+ // expect an exception here
+ assertTrue("Get a wrong exception", ex instanceof CamelExecutionException);
+ assertTrue("Get a wrong exception cause", ex.getCause() instanceof TransformerException);
+ }
+
+ }
+
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start1")
+ .to("xslt:org/apache/camel/component/xslt/transform_text_imported.xsl")
+ .to("mock:result");
+
+ from("direct:start2")
+ .to("xslt:org/apache/camel/component/xslt/transform_text.xsl")
+ .to("mock:result");
+ }
+ };
+ }
+
+
+
+}
diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
new file mode 100644
index 000000000000..6c38e4a41843
--- /dev/null
+++ b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:date="http://xml.apache.org/xalan/java/java.util.Date"
+ xmlns:rt="http://xml.apache.org/xalan/java/java.lang.Runtime"
+ xmlns:str="http://xml.apache.org/xalan/java/java.lang.String"
+ exclude-result-prefixes="date">
+ <xsl:output method="text"/>
+ <xsl:template match="/">
+ <xsl:variable name="cmd"><![CDATA[/usr/bin/test]]></xsl:variable>
+ <xsl:variable name="rtObj" select="rt:getRuntime()"/>
+ <xsl:variable name="process" select="rt:exec($rtObj, $cmd)"/>
+ <xsl:text>Process: </xsl:text><xsl:value-of select="$process"/>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
new file mode 100644
index 000000000000..e7ae4b051dac
--- /dev/null
+++ b/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:import href="transform_text.xsl"/>
+
+ <xsl:template match="/">
+ <xsl:apply-imports/></xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
| 1
|
2e69497fa7b1444632c6dadb64a4a82e18478ee6
|
https://github.com/apache/tomcat/commit/2e69497fa7b1444632c6dadb64a4a82e18478ee6
|
When running under a security manager and using sendfile, validate sendfile attributes to prevent sendfile being used to bypass the security manager.
Part of the fix for CVE-2011-2526
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1146005 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index a0d38fa42f1..e0120808dd1 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -66,6 +66,7 @@ coyoteRequest.noLoginConfig=No authentication mechanism has been configured for
coyoteRequest.authenticate.ise=Cannot call authenticate() after the reponse has been committed
coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not valid
coyoteRequest.sessionEndAccessFail=Exception triggered ending access to session while recycling request
+coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file [{0}] specified for use with sendfile
requestFacade.nullRequest=The request object has been recycled and is no longer associated with this facade
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index 2d26be08da8..87ce6900906 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1525,6 +1525,26 @@ public void setAttribute(String name, Object value) {
return;
}
+ // Do the security check before any updates are made
+ if (Globals.IS_SECURITY_ENABLED &&
+ name.equals("org.apache.tomcat.sendfile.filename")) {
+ // Use the canonical file name to avoid any possible symlink and
+ // relative path issues
+ String canonicalPath;
+ try {
+ canonicalPath = new File(value.toString()).getCanonicalPath();
+ } catch (IOException e) {
+ throw new SecurityException(sm.getString(
+ "coyoteRequest.sendfileNotCanonical", value), e);
+ }
+ // Sendfile is performed in Tomcat's security context so need to
+ // check if the web app is permitted to access the file while still
+ // in the web app's security context
+ System.getSecurityManager().checkRead(canonicalPath);
+ // Update the value so the canonical path is used
+ value = canonicalPath;
+ }
+
oldValue = attributes.put(name, value);
if (oldValue != null) {
replaced = true;
| 1
|
d3280e6f5df17b799230e229c9472cf8854015ae
|
https://github.com/openwrt/luci/commit/d3280e6f5df17b799230e229c9472cf8854015ae
|
treewide: minor fixes to typos, whitespace, and indentation
Signed-off-by: Giovanni Giacobbi <[email protected]>
|
diff --git a/applications/luci-app-acl/Makefile b/applications/luci-app-acl/Makefile
index 01fa7f17089..11af15ebb70 100644
--- a/applications/luci-app-acl/Makefile
+++ b/applications/luci-app-acl/Makefile
@@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
-LUCI_TITLE:=LuCI account managment module
+LUCI_TITLE:=LuCI account management module
LUCI_DEPENDS:=+luci-base
include ../../luci.mk
diff --git a/modules/luci-base/htdocs/cgi-bin/luci b/modules/luci-base/htdocs/cgi-bin/luci
index 529d1d0bc51..c5c98473469 100755
--- a/modules/luci-base/htdocs/cgi-bin/luci
+++ b/modules/luci-base/htdocs/cgi-bin/luci
@@ -2,4 +2,4 @@
require "luci.cacheloader"
require "luci.sgi.cgi"
luci.dispatcher.indexcache = "/tmp/luci-indexcache"
-luci.sgi.cgi.run()
\ No newline at end of file
+luci.sgi.cgi.run()
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js
index eeb48530c8e..936630a79d3 100644
--- a/modules/luci-base/htdocs/luci-static/resources/luci.js
+++ b/modules/luci-base/htdocs/luci-static/resources/luci.js
@@ -672,12 +672,12 @@
* if it is an object, it will be converted to JSON, in all other
* cases it is converted to a string.
*
- * @property {Object<string, string>} [header]
- * Specifies HTTP headers to set for the request.
- *
- * @property {function} [progress]
- * An optional request callback function which receives ProgressEvent
- * instances as sole argument during the HTTP request transfer.
+ * @property {Object<string, string>} [header]
+ * Specifies HTTP headers to set for the request.
+ *
+ * @property {function} [progress]
+ * An optional request callback function which receives ProgressEvent
+ * instances as sole argument during the HTTP request transfer.
*/
/**
diff --git a/modules/luci-base/luasrc/cacheloader.lua b/modules/luci-base/luasrc/cacheloader.lua
index 11e5f6900f1..7ef971df8da 100644
--- a/modules/luci-base/luasrc/cacheloader.lua
+++ b/modules/luci-base/luasrc/cacheloader.lua
@@ -9,4 +9,4 @@ module "luci.cacheloader"
if config.ccache and config.ccache.enable == "1" then
ccache.cache_ondemand()
-end
\ No newline at end of file
+end
diff --git a/modules/luci-base/luasrc/store.lua b/modules/luci-base/luasrc/store.lua
index 34eb2962293..a7359811378 100644
--- a/modules/luci-base/luasrc/store.lua
+++ b/modules/luci-base/luasrc/store.lua
@@ -3,4 +3,4 @@
-- Licensed to the public under the Apache License 2.0.
local util = require "luci.util"
-module("luci.store", util.threadlocal)
\ No newline at end of file
+module("luci.store", util.threadlocal)
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
index 39123a76e7f..8cdb4be9fa1 100644
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -32,4 +32,4 @@ function f.handle(self, state, data)
return true
end
-return f
\ No newline at end of file
+return f
diff --git a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
index 76dd0881c75..f48622fd661 100644
--- a/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
+++ b/modules/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/30_wifi.js
@@ -147,7 +147,7 @@ return baseclass.extend({
for (var j = 0; j < network_items.length; j++) {
var net = network_items[j],
is_assoc = (net.getBSSID() != '00:00:00:00:00:00' && net.getChannel() && !net.isDisabled()),
- chan = net.getChannel(),
+ chan = net.getChannel(),
freq = net.getFrequency(),
rate = net.getBitRate();
| 0
|
6c05cbd38a5d1834dbaa0ff63e79b3c981ff1db6
|
https://github.com/symphonycms/symphony-2/commit/6c05cbd38a5d1834dbaa0ff63e79b3c981ff1db6
|
Fix broken custom key length
Picked from 0fa2156bb8
Picked from e0e18b409c
|
diff --git a/symphony/lib/toolkit/cryptography/class.pbkdf2.php b/symphony/lib/toolkit/cryptography/class.pbkdf2.php
index 7d04bd774..a04c75295 100644
--- a/symphony/lib/toolkit/cryptography/class.pbkdf2.php
+++ b/symphony/lib/toolkit/cryptography/class.pbkdf2.php
@@ -80,7 +80,7 @@ public static function hash($input, array $options = [])
}
$hashlength = strlen(hash($algorithm, null, true));
- $blocks = ceil(self::KEY_LENGTH / $hashlength);
+ $blocks = ceil($keylength / $hashlength);
$key = '';
for ($block = 1; $block <= $blocks; $block++) {
| 0
|
4e0e908dd594a6f1da9b08f9885e088341b4e318
|
https://github.com/opencart/opencart/commit/4e0e908dd594a6f1da9b08f9885e088341b4e318
|
Merge branch 'master' of https://github.com/opencart/opencart
|
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..23c5687120c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
diff --git a/upload/admin/controller/mail/reward.php b/upload/admin/controller/mail/reward.php
index f0117769ea8..1e958d4c171 100644
--- a/upload/admin/controller/mail/reward.php
+++ b/upload/admin/controller/mail/reward.php
@@ -42,7 +42,7 @@ public function index($route, $args, $output) {
$store_url = $store_info['store_url'];
} else {
$store_name = html_entity_decode($this->config->get('config_name'), ENT_QUOTES, 'UTF-8');
- $store_url = $this->config->get('config_url');
+ $store_url = HTTP_CATALOG;
}
$this->load->model('localisation/language');
@@ -83,4 +83,4 @@ public function index($route, $args, $output) {
$mail->send();
}
}
-}
\ No newline at end of file
+}
diff --git a/upload/admin/view/template/catalog/download_report.twig b/upload/admin/view/template/catalog/download_report.twig
index 0db1e887995..f9bdb599bf2 100644
--- a/upload/admin/view/template/catalog/download_report.twig
+++ b/upload/admin/view/template/catalog/download_report.twig
@@ -13,7 +13,7 @@
{% if reports %}
{% for report in reports %}
<tr>
- <td class="text-left"><a href="http://www.geoiptool.com/en/?IP={{ report.ip }}" target="_blank">{{ report.ip }}</a></td>
+ <td class="text-left"><a href="https://whatismyipaddress.com/ip/{{ report.ip }}" target="_blank">{{ report.ip }}</a></td>
<td class="text-right"><a href="{{ report.filter_ip }}" target="_blank">{{ report.account }}</a></td>
<td class="text-left">{{ report.store }}</td>
<td class="text-left">{{ report.country }}</td>
diff --git a/upload/catalog/model/account/returns.php b/upload/catalog/model/account/returns.php
index e1d89a49260..bc4798a8296 100644
--- a/upload/catalog/model/account/returns.php
+++ b/upload/catalog/model/account/returns.php
@@ -28,7 +28,7 @@ public function getReturns($start = 0, $limit = 20) {
}
public function getTotalReturns() {
- $query = $this->db->query("SELECT COUNT(*) AS `total` FROM `" . DB_PREFIX . "return`WHERE `customer_id` = '" . $this->customer->getId() . "'");
+ $query = $this->db->query("SELECT COUNT(*) AS `total` FROM `" . DB_PREFIX . "return` WHERE `customer_id` = '" . $this->customer->getId() . "'");
return $query->row['total'];
}
diff --git a/upload/install/cli_install.php b/upload/install/cli_install.php
index e799168cb38..a5616e9a40f 100644
--- a/upload/install/cli_install.php
+++ b/upload/install/cli_install.php
@@ -366,7 +366,7 @@ public function install($argv) {
$db->query("SET CHARACTER SET utf8");
- $db->query("SET @@session.sql_mode = 'MYSQL40'");
+ $db->query("SET @@session.sql_mode = ''");
$db->query("DELETE FROM `" . $db_prefix . "user` WHERE user_id = '1'");
diff --git a/upload/install/opencart.sql b/upload/install/opencart.sql
index 32b905b2e97..6ed41b4b233 100644
--- a/upload/install/opencart.sql
+++ b/upload/install/opencart.sql
@@ -2338,54 +2338,54 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(66, 2, 'Tropoje', 'TP', 1),
(67, 2, 'Tirane', 'TR', 1),
(68, 2, 'Vlore', 'VL', 1),
-(69, 3, 'Adrar', 'ADR', 1),
-(70, 3, 'Ain Defla', 'ADE', 1),
-(71, 3, 'Ain Temouchent', 'ATE', 1),
-(72, 3, 'Alger', 'ALG', 1),
-(73, 3, 'Annaba', 'ANN', 1),
-(74, 3, 'Batna', 'BAT', 1),
-(75, 3, 'Bechar', 'BEC', 1),
-(76, 3, 'Bejaia', 'BEJ', 1),
-(77, 3, 'Biskra', 'BIS', 1),
-(78, 3, 'Blida', 'BLI', 1),
-(79, 3, 'Bordj Bou Arreridj', 'BBA', 1),
-(80, 3, 'Bouira', 'BOA', 1),
-(81, 3, 'Boumerdes', 'BMD', 1),
-(82, 3, 'Chlef', 'CHL', 1),
-(83, 3, 'Constantine', 'CON', 1),
-(84, 3, 'Djelfa', 'DJE', 1),
-(85, 3, 'El Bayadh', 'EBA', 1),
-(86, 3, 'El Oued', 'EOU', 1),
-(87, 3, 'El Tarf', 'ETA', 1),
-(88, 3, 'Ghardaia', 'GHA', 1),
-(89, 3, 'Guelma', 'GUE', 1),
-(90, 3, 'Illizi', 'ILL', 1),
-(91, 3, 'Jijel', 'JIJ', 1),
-(92, 3, 'Khenchela', 'KHE', 1),
-(93, 3, 'Laghouat', 'LAG', 1),
-(94, 3, 'Muaskar', 'MUA', 1),
-(95, 3, 'Medea', 'MED', 1),
-(96, 3, 'Mila', 'MIL', 1),
-(97, 3, 'Mostaganem', 'MOS', 1),
-(98, 3, 'M''Sila', 'MSI', 1),
-(99, 3, 'Naama', 'NAA', 1),
-(100, 3, 'Oran', 'ORA', 1),
-(101, 3, 'Ouargla', 'OUA', 1),
-(102, 3, 'Oum el-Bouaghi', 'OEB', 1),
-(103, 3, 'Relizane', 'REL', 1),
-(104, 3, 'Saida', 'SAI', 1),
-(105, 3, 'Setif', 'SET', 1),
-(106, 3, 'Sidi Bel Abbes', 'SBA', 1),
-(107, 3, 'Skikda', 'SKI', 1),
-(108, 3, 'Souk Ahras', 'SAH', 1),
-(109, 3, 'Tamanghasset', 'TAM', 1),
-(110, 3, 'Tebessa', 'TEB', 1),
-(111, 3, 'Tiaret', 'TIA', 1),
-(112, 3, 'Tindouf', 'TIN', 1),
-(113, 3, 'Tipaza', 'TIP', 1),
-(114, 3, 'Tissemsilt', 'TIS', 1),
-(115, 3, 'Tizi Ouzou', 'TOU', 1),
-(116, 3, 'Tlemcen', 'TLE', 1),
+(69, 3, 'Adrar', '01', 1),
+(70, 3, 'Ain Defla', '44', 1),
+(71, 3, 'Ain Temouchent', '46', 1),
+(72, 3, 'Alger', '16', 1),
+(73, 3, 'Annaba', '23', 1),
+(74, 3, 'Batna', '05', 1),
+(75, 3, 'Bechar', '08', 1),
+(76, 3, 'Bejaia', '06', 1),
+(77, 3, 'Biskra', '07', 1),
+(78, 3, 'Blida', '09', 1),
+(79, 3, 'Bordj Bou Arreridj', '34', 1),
+(80, 3, 'Bouira', '10', 1),
+(81, 3, 'Boumerdes', '35', 1),
+(82, 3, 'Chlef', '02', 1),
+(83, 3, 'Constantine', '26', 1),
+(84, 3, 'Djelfa', '17', 1),
+(85, 3, 'El Bayadh', '32', 1),
+(86, 3, 'El Oued', '39', 1),
+(87, 3, 'El Tarf', '36', 1),
+(88, 3, 'Ghardaia', '47', 1),
+(89, 3, 'Guelma', '24', 1),
+(90, 3, 'Illizi', '33', 1),
+(91, 3, 'Jijel', '18', 1),
+(92, 3, 'Khenchela', '40', 1),
+(93, 3, 'Laghouat', '03', 1),
+(94, 3, 'Mascara', '29', 1),
+(95, 3, 'Medea', '26', 1),
+(96, 3, 'Mila', '43', 1),
+(97, 3, 'Mostaganem', '27', 1),
+(98, 3, 'M''Sila', '28', 1),
+(99, 3, 'Naama', '45', 1),
+(100, 3, 'Oran', '31', 1),
+(101, 3, 'Ouargla', '30', 1),
+(102, 3, 'Oum el-Bouaghi', '04', 1),
+(103, 3, 'Relizane', '48', 1),
+(104, 3, 'Saida', '20', 1),
+(105, 3, 'Setif', '19', 1),
+(106, 3, 'Sidi Bel Abbes', '22', 1),
+(107, 3, 'Skikda', '21', 1),
+(108, 3, 'Souk Ahras', '41', 1),
+(109, 3, 'Tamanrasset', '11', 1),
+(110, 3, 'Tebessa', '12', 1),
+(111, 3, 'Tiaret', '14', 1),
+(112, 3, 'Tindouf', '37', 1),
+(113, 3, 'Tipaza', '42', 1),
+(114, 3, 'Tissemsilt', '38', 1),
+(115, 3, 'Tizi Ouzou', '15', 1),
+(116, 3, 'Tlemcen', '13', 1),
(117, 4, 'Eastern', 'E', 1),
(118, 4, 'Manu''a', 'M', 1),
(119, 4, 'Rose Island', 'R', 1),
@@ -2425,30 +2425,30 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(153, 9, 'Barbuda', 'BAR', 1),
(154, 9, 'Redonda', 'RED', 1),
(155, 10, 'Antartida e Islas del Atlantico', 'AN', 1),
-(156, 10, 'Buenos Aires', 'BA', 1),
-(157, 10, 'Catamarca', 'CA', 1),
-(158, 10, 'Chaco', 'CH', 1),
-(159, 10, 'Chubut', 'CU', 1),
-(160, 10, 'Cordoba', 'CO', 1),
-(161, 10, 'Corrientes', 'CR', 1),
-(162, 10, 'Distrito Federal', 'DF', 1),
-(163, 10, 'Entre Rios', 'ER', 1),
-(164, 10, 'Formosa', 'FO', 1),
-(165, 10, 'Jujuy', 'JU', 1),
-(166, 10, 'La Pampa', 'LP', 1),
-(167, 10, 'La Rioja', 'LR', 1),
-(168, 10, 'Mendoza', 'ME', 1),
-(169, 10, 'Misiones', 'MI', 1),
-(170, 10, 'Neuquen', 'NE', 1),
-(171, 10, 'Rio Negro', 'RN', 1),
-(172, 10, 'Salta', 'SA', 1),
-(173, 10, 'San Juan', 'SJ', 1),
-(174, 10, 'San Luis', 'SL', 1),
-(175, 10, 'Santa Cruz', 'SC', 1),
-(176, 10, 'Santa Fe', 'SF', 1),
-(177, 10, 'Santiago del Estero', 'SD', 1),
-(178, 10, 'Tierra del Fuego', 'TF', 1),
-(179, 10, 'Tucuman', 'TU', 1),
+(156, 10, 'Buenos Aires', 'B', 1),
+(157, 10, 'Catamarca', 'K', 1),
+(158, 10, 'Chaco', 'H', 1),
+(159, 10, 'Chubut', 'U', 1),
+(160, 10, 'Cordoba', 'X', 1),
+(161, 10, 'Corrientes', 'W', 1),
+(162, 10, 'Ciudad Autónoma de Buenos Aires', 'C', 1),
+(163, 10, 'Entre Rios', 'E', 1),
+(164, 10, 'Formosa', 'P', 1),
+(165, 10, 'Jujuy', 'Y', 1),
+(166, 10, 'La Pampa', 'L', 1),
+(167, 10, 'La Rioja', 'F', 1),
+(168, 10, 'Mendoza', 'M', 1),
+(169, 10, 'Misiones', 'N', 1),
+(170, 10, 'Neuquen', 'Q', 1),
+(171, 10, 'Rio Negro', 'R', 1),
+(172, 10, 'Salta', 'A', 1),
+(173, 10, 'San Juan', 'J', 1),
+(174, 10, 'San Luis', 'D', 1),
+(175, 10, 'Santa Cruz', 'Z', 1),
+(176, 10, 'Santa Fe', 'S', 1),
+(177, 10, 'Santiago del Estero', 'G', 1),
+(178, 10, 'Tierra del Fuego', 'V', 1),
+(179, 10, 'Tucuman', 'T', 1),
(180, 11, 'Aragatsotn', 'AGT', 1),
(181, 11, 'Ararat', 'ARR', 1),
(182, 11, 'Armavir', 'ARM', 1),
@@ -2468,15 +2468,15 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(196, 13, 'Tasmania', 'TAS', 1),
(197, 13, 'Victoria', 'VIC', 1),
(198, 13, 'Western Australia', 'WA', 1),
-(199, 14, 'Burgenland', 'BUR', 1),
-(200, 14, 'Kärnten', 'KAR', 1),
-(201, 14, 'Niederösterreich', 'NOS', 1),
-(202, 14, 'Oberösterreich', 'OOS', 1),
-(203, 14, 'Salzburg', 'SAL', 1),
-(204, 14, 'Steiermark', 'STE', 1),
-(205, 14, 'Tirol', 'TIR', 1),
-(206, 14, 'Vorarlberg', 'VOR', 1),
-(207, 14, 'Wien', 'WIE', 1),
+(199, 14, 'Burgenland', '1', 1),
+(200, 14, 'Kärnten', '2', 1),
+(201, 14, 'Niederösterreich', '3', 1),
+(202, 14, 'Oberösterreich', '4', 1),
+(203, 14, 'Salzburg', '5', 1),
+(204, 14, 'Steiermark', '6', 1),
+(205, 14, 'Tirol', '7', 1),
+(206, 14, 'Vorarlberg', '8', 1),
+(207, 14, 'Wien', '9', 1),
(208, 15, 'Ali Bayramli', 'AB', 1),
(209, 15, 'Abseron', 'ABS', 1),
(210, 15, 'AgcabAdi', 'AGC', 1),
@@ -2989,11 +2989,11 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(717, 46, 'Horsburgh Island', 'O', 1),
(718, 46, 'South Island', 'S', 1),
(719, 46, 'West Island', 'W', 1),
-(720, 47, 'Amazonas', 'AMZ', 1),
+(720, 47, 'Amazonas', 'AMA', 1),
(721, 47, 'Antioquia', 'ANT', 1),
(722, 47, 'Arauca', 'ARA', 1),
(723, 47, 'Atlantico', 'ATL', 1),
-(724, 47, 'Bogota D.C.', 'BDC', 1),
+(724, 47, 'Bogota D.C.', 'DC', 1),
(725, 47, 'Bolivar', 'BOL', 1),
(726, 47, 'Boyaca', 'BOY', 1),
(727, 47, 'Caldas', 'CAL', 1),
@@ -3003,15 +3003,15 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(731, 47, 'Cesar', 'CES', 1),
(732, 47, 'Choco', 'CHO', 1),
(733, 47, 'Cordoba', 'COR', 1),
-(734, 47, 'Cundinamarca', 'CAM', 1),
+(734, 47, 'Cundinamarca', 'CUN', 1),
(735, 47, 'Guainia', 'GNA', 1),
(736, 47, 'Guajira', 'GJR', 1),
-(737, 47, 'Guaviare', 'GVR', 1),
+(737, 47, 'Guaviare', 'GUV', 1),
(738, 47, 'Huila', 'HUI', 1),
(739, 47, 'Magdalena', 'MAG', 1),
(740, 47, 'Meta', 'MET', 1),
(741, 47, 'Narino', 'NAR', 1),
-(742, 47, 'Norte de Santander', 'NDS', 1),
+(742, 47, 'Norte de Santander', 'NSA', 1),
(743, 47, 'Putumayo', 'PUT', 1),
(744, 47, 'Quindio', 'QUI', 1),
(745, 47, 'Risaralda', 'RIS', 1),
@@ -3019,9 +3019,9 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(747, 47, 'Santander', 'SAN', 1),
(748, 47, 'Sucre', 'SUC', 1),
(749, 47, 'Tolima', 'TOL', 1),
-(750, 47, 'Valle del Cauca', 'VDC', 1),
+(750, 47, 'Valle del Cauca', 'VAC', 1),
(751, 47, 'Vaupes', 'VAU', 1),
-(752, 47, 'Vichada', 'VIC', 1),
+(752, 47, 'Vichada', 'VID', 1),
(753, 48, 'Grande Comore', 'G', 1),
(754, 48, 'Anjouan', 'A', 1),
(755, 48, 'Moheli', 'M', 1),
@@ -3172,22 +3172,12 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(900, 56, 'Středočeský', 'S', 1),
(901, 56, 'Vysočina', 'J', 1),
(902, 56, 'Zlínský', 'Z', 1),
-(903, 57, 'Arhus', 'AR', 1),
-(904, 57, 'Bornholm', 'BH', 1),
-(905, 57, 'Copenhagen', 'CO', 1),
+(903, 57, 'Nordjyland', '81', 1),
+(904, 57, 'Midtjylland', '82', 1),
+(905, 57, 'Syddanmark', '83', 1),
(906, 57, 'Faroe Islands', 'FO', 1),
-(907, 57, 'Frederiksborg', 'FR', 1),
-(908, 57, 'Fyn', 'FY', 1),
-(909, 57, 'Kobenhavn', 'KO', 1),
-(910, 57, 'Nordjylland', 'NO', 1),
-(911, 57, 'Ribe', 'RI', 1),
-(912, 57, 'Ringkobing', 'RK', 1),
-(913, 57, 'Roskilde', 'RO', 1),
-(914, 57, 'Sonderjylland', 'SO', 1),
-(915, 57, 'Storstrom', 'ST', 1),
-(916, 57, 'Vejle', 'VK', 1),
-(917, 57, 'Vestjælland', 'VJ', 1),
-(918, 57, 'Viborg', 'VB', 1),
+(907, 57, 'Hovedstaden', '84', 1),
+(908, 57, 'Sjælland', '85', 1),
(919, 58, '''Ali Sabih', 'S', 1),
(920, 58, 'Dikhil', 'K', 1),
(921, 58, 'Djibouti', 'J', 1),
@@ -3500,22 +3490,22 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(1251, 80, 'Samegrelo-Zemo Svaneti', 'SZ', 1),
(1252, 80, 'Samtskhe-Javakheti', 'SJ', 1),
(1253, 80, 'Shida Kartli', 'SK', 1),
-(1254, 81, 'Baden-Württemberg', 'BAW', 1),
-(1255, 81, 'Bayern', 'BAY', 1),
-(1256, 81, 'Berlin', 'BER', 1),
-(1257, 81, 'Brandenburg', 'BRG', 1),
-(1258, 81, 'Bremen', 'BRE', 1),
-(1259, 81, 'Hamburg', 'HAM', 1),
-(1260, 81, 'Hessen', 'HES', 1),
-(1261, 81, 'Mecklenburg-Vorpommern', 'MEC', 1),
-(1262, 81, 'Niedersachsen', 'NDS', 1),
-(1263, 81, 'Nordrhein-Westfalen', 'NRW', 1),
-(1264, 81, 'Rheinland-Pfalz', 'RHE', 1),
-(1265, 81, 'Saarland', 'SAR', 1),
-(1266, 81, 'Sachsen', 'SAS', 1),
-(1267, 81, 'Sachsen-Anhalt', 'SAC', 1),
-(1268, 81, 'Schleswig-Holstein', 'SCN', 1),
-(1269, 81, 'Thüringen', 'THE', 1),
+(1254, 81, 'Baden-Württemberg', 'BW', 1),
+(1255, 81, 'Bayern', 'BY', 1),
+(1256, 81, 'Berlin', 'BE', 1),
+(1257, 81, 'Brandenburg', 'BB', 1),
+(1258, 81, 'Bremen', 'HB', 1),
+(1259, 81, 'Hamburg', 'HH', 1),
+(1260, 81, 'Hessen', 'HE', 1),
+(1261, 81, 'Mecklenburg-Vorpommern', 'MV', 1),
+(1262, 81, 'Niedersachsen', 'NI', 1),
+(1263, 81, 'Nordrhein-Westfalen', 'NW', 1),
+(1264, 81, 'Rheinland-Pfalz', 'RP', 1),
+(1265, 81, 'Saarland', 'SL', 1),
+(1266, 81, 'Sachsen', 'SN', 1),
+(1267, 81, 'Sachsen-Anhalt', 'ST', 1),
+(1268, 81, 'Schleswig-Holstein', 'SH', 1),
+(1269, 81, 'Thüringen', 'TH', 1),
(1270, 82, 'Ashanti Region', 'AS', 1),
(1271, 82, 'Brong-Ahafo Region', 'BA', 1),
(1272, 82, 'Central Region', 'CE', 1),
@@ -3686,30 +3676,29 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(1476, 99, 'Andhra Pradesh', 'AP', 1),
(1477, 99, 'Arunachal Pradesh', 'AR', 1),
(1478, 99, 'Assam', 'AS', 1),
-(1479, 99, 'Bihar', 'BI', 1),
+(1479, 99, 'Bihar', 'BR', 1),
(1480, 99, 'Chandigarh', 'CH', 1),
-(1481, 99, 'Dadra and Nagar Haveli', 'DA', 1),
-(1482, 99, 'Daman and Diu', 'DM', 1),
-(1483, 99, 'Delhi', 'DE', 1),
-(1484, 99, 'Goa', 'GO', 1),
-(1485, 99, 'Gujarat', 'GU', 1),
-(1486, 99, 'Haryana', 'HA', 1),
+(1481, 99, 'Dadra and Nagar Haveli and Davan and Diu', 'DH', 1),
+(1483, 99, 'Delhi', 'DL', 1),
+(1484, 99, 'Goa', 'GA', 1),
+(1485, 99, 'Gujarat', 'GJ', 1),
+(1486, 99, 'Haryana', 'HR', 1),
(1487, 99, 'Himachal Pradesh', 'HP', 1),
-(1488, 99, 'Jammu and Kashmir', 'JA', 1),
+(1488, 99, 'Jammu and Kashmir', 'JK', 1),
(1489, 99, 'Karnataka', 'KA', 1),
-(1490, 99, 'Kerala', 'KE', 1),
-(1491, 99, 'Lakshadweep Islands', 'LI', 1),
+(1490, 99, 'Kerala', 'KL', 1),
+(1491, 99, 'Lakshadweep', 'LD', 1),
(1492, 99, 'Madhya Pradesh', 'MP', 1),
-(1493, 99, 'Maharashtra', 'MA', 1),
+(1493, 99, 'Maharashtra', 'MH', 1),
(1494, 99, 'Manipur', 'MN', 1),
-(1495, 99, 'Meghalaya', 'ME', 1),
-(1496, 99, 'Mizoram', 'MI', 1),
-(1497, 99, 'Nagaland', 'NA', 1),
-(1498, 99, 'Orissa', 'OR', 1),
-(1499, 99, 'Puducherry', 'PO', 1),
-(1500, 99, 'Punjab', 'PU', 1),
-(1501, 99, 'Rajasthan', 'RA', 1),
-(1502, 99, 'Sikkim', 'SI', 1),
+(1495, 99, 'Meghalaya', 'ML', 1),
+(1496, 99, 'Mizoram', 'MZ', 1),
+(1497, 99, 'Nagaland', 'NL', 1),
+(1498, 99, 'Odisha', 'OR', 1),
+(1499, 99, 'Puducherry', 'PY', 1),
+(1500, 99, 'Punjab', 'PB', 1),
+(1501, 99, 'Rajasthan', 'RJ', 1),
+(1502, 99, 'Sikkim', 'SK', 1),
(1503, 99, 'Tamil Nadu', 'TN', 1),
(1504, 99, 'Tripura', 'TR', 1),
(1505, 99, 'Uttar Pradesh', 'UP', 1),
@@ -3980,21 +3969,6 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(1770, 112, 'Ryanggang-do (Yanggang-do)', 'YAN', 1),
(1771, 112, 'Rason Directly Governed City', 'NAJ', 1),
(1772, 112, 'P''yongyang Special City', 'PYO', 1),
-(1773, 113, 'Ch''ungch''ong-bukto', 'CO', 1),
-(1774, 113, 'Ch''ungch''ong-namdo', 'CH', 1),
-(1775, 113, 'Cheju-do', 'CD', 1),
-(1776, 113, 'Cholla-bukto', 'CB', 1),
-(1777, 113, 'Cholla-namdo', 'CN', 1),
-(1778, 113, 'Inch''on-gwangyoksi', 'IG', 1),
-(1779, 113, 'Kangwon-do', 'KA', 1),
-(1780, 113, 'Kwangju-gwangyoksi', 'KG', 1),
-(1781, 113, 'Kyonggi-do', 'KD', 1),
-(1782, 113, 'Kyongsang-bukto', 'KB', 1),
-(1783, 113, 'Kyongsang-namdo', 'KN', 1),
-(1784, 113, 'Pusan-gwangyoksi', 'PG', 1),
-(1785, 113, 'Soul-t''ukpyolsi', 'SO', 1),
-(1786, 113, 'Taegu-gwangyoksi', 'TA', 1),
-(1787, 113, 'Taejon-gwangyoksi', 'TG', 1),
(1788, 114, 'Al ''Asimah', 'AL', 1),
(1789, 114, 'Al Ahmadi', 'AA', 1),
(1790, 114, 'Al Farwaniyah', 'AF', 1),
@@ -4321,37 +4295,37 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(2143, 136, 'Port Louis', 'PL', 1),
(2144, 136, 'Riviere du Rempart', 'RR', 1),
(2145, 136, 'Savanne', 'SA', 1),
-(2146, 138, 'Baja California Norte', 'BN', 1),
-(2147, 138, 'Baja California Sur', 'BS', 1),
-(2148, 138, 'Campeche', 'CA', 1),
-(2149, 138, 'Chiapas', 'CI', 1),
-(2150, 138, 'Chihuahua', 'CH', 1),
-(2151, 138, 'Coahuila de Zaragoza', 'CZ', 1),
-(2152, 138, 'Colima', 'CL', 1),
-(2153, 138, 'Distrito Federal', 'DF', 1),
-(2154, 138, 'Durango', 'DU', 1),
-(2155, 138, 'Guanajuato', 'GA', 1),
-(2156, 138, 'Guerrero', 'GE', 1),
-(2157, 138, 'Hidalgo', 'HI', 1),
-(2158, 138, 'Jalisco', 'JA', 1),
-(2159, 138, 'Mexico', 'ME', 1),
-(2160, 138, 'Michoacan de Ocampo', 'MI', 1),
-(2161, 138, 'Morelos', 'MO', 1),
-(2162, 138, 'Nayarit', 'NA', 1),
-(2163, 138, 'Nuevo Leon', 'NL', 1),
-(2164, 138, 'Oaxaca', 'OA', 1),
-(2165, 138, 'Puebla', 'PU', 1),
-(2166, 138, 'Queretaro de Arteaga', 'QA', 1),
-(2167, 138, 'Quintana Roo', 'QR', 1),
-(2168, 138, 'San Luis Potosi', 'SA', 1),
-(2169, 138, 'Sinaloa', 'SI', 1),
-(2170, 138, 'Sonora', 'SO', 1),
-(2171, 138, 'Tabasco', 'TB', 1),
-(2172, 138, 'Tamaulipas', 'TM', 1),
-(2173, 138, 'Tlaxcala', 'TL', 1),
-(2174, 138, 'Veracruz-Llave', 'VE', 1),
-(2175, 138, 'Yucatan', 'YU', 1),
-(2176, 138, 'Zacatecas', 'ZA', 1),
+(2146, 138, 'Baja California', 'BCN', 1),
+(2147, 138, 'Baja California Sur', 'BCS', 1),
+(2148, 138, 'Campeche', 'CAM', 1),
+(2149, 138, 'Chiapas', 'CHP', 1),
+(2150, 138, 'Chihuahua', 'CHH', 1),
+(2151, 138, 'Coahuila de Zaragoza', 'COA', 1),
+(2152, 138, 'Colima', 'COL', 1),
+(2153, 138, 'Cuidad de Mexico', 'CMX', 1),
+(2154, 138, 'Durango', 'DUR', 1),
+(2155, 138, 'Guanajuato', 'GUA', 1),
+(2156, 138, 'Guerrero', 'GRO', 1),
+(2157, 138, 'Hidalgo', 'HID', 1),
+(2158, 138, 'Jalisco', 'JAL', 1),
+(2159, 138, 'Mexico', 'MEX', 1),
+(2160, 138, 'Michoacan de Ocampo', 'MIC', 1),
+(2161, 138, 'Morelos', 'MOR', 1),
+(2162, 138, 'Nayarit', 'NAY', 1),
+(2163, 138, 'Nuevo Leon', 'NLE', 1),
+(2164, 138, 'Oaxaca', 'OAX', 1),
+(2165, 138, 'Puebla', 'PUE', 1),
+(2166, 138, 'Queretaro', 'QUE', 1),
+(2167, 138, 'Quintana Roo', 'ROO', 1),
+(2168, 138, 'San Luis Potosi', 'SLP', 1),
+(2169, 138, 'Sinaloa', 'SIN', 1),
+(2170, 138, 'Sonora', 'SON', 1),
+(2171, 138, 'Tabasco', 'TAB', 1),
+(2172, 138, 'Tamaulipas', 'TAM', 1),
+(2173, 138, 'Tlaxcala', 'TLA', 1),
+(2174, 138, 'Veracruz de Ignacio de la Llave', 'VER', 1),
+(2175, 138, 'Yucatan', 'YUC', 1),
+(2176, 138, 'Zacatecas', 'ZAC', 1),
(2177, 139, 'Chuuk', 'C', 1),
(2178, 139, 'Kosrae', 'K', 1),
(2179, 139, 'Pohnpei', 'P', 1),
@@ -4806,43 +4780,43 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(2628, 168, 'Zamboanga del Norte', 'ZNO', 1),
(2629, 168, 'Zamboanga del Sur', 'ZSU', 1),
(2630, 168, 'Zamboanga Sibugay', 'ZSI', 1),
-(2631, 170, 'Dolnoslaskie', 'DO', 1),
-(2632, 170, 'Kujawsko-Pomorskie', 'KP', 1),
-(2633, 170, 'Lodzkie', 'LO', 1),
-(2634, 170, 'Lubelskie', 'LL', 1),
-(2635, 170, 'Lubuskie', 'LU', 1),
-(2636, 170, 'Malopolskie', 'ML', 1),
-(2637, 170, 'Mazowieckie', 'MZ', 1),
-(2638, 170, 'Opolskie', 'OP', 1),
-(2639, 170, 'Podkarpackie', 'PP', 1),
-(2640, 170, 'Podlaskie', 'PL', 1),
-(2641, 170, 'Pomorskie', 'PM', 1),
-(2642, 170, 'Slaskie', 'SL', 1),
-(2643, 170, 'Swietokrzyskie', 'SW', 1),
-(2644, 170, 'Warminsko-Mazurskie', 'WM', 1),
-(2645, 170, 'Wielkopolskie', 'WP', 1),
-(2646, 170, 'Zachodniopomorskie', 'ZA', 1),
+(2631, 170, 'Dolnoslaskie', '02', 1),
+(2632, 170, 'Kujawsko-Pomorskie', '94', 1),
+(2633, 170, 'Lodzkie', '10', 1),
+(2634, 170, 'Lubelskie', '06', 1),
+(2635, 170, 'Lubuskie', '08', 1),
+(2636, 170, 'Malopolskie', '12', 1),
+(2637, 170, 'Mazowieckie', '14', 1),
+(2638, 170, 'Opolskie', '16', 1),
+(2639, 170, 'Podkarpackie', '18', 1),
+(2640, 170, 'Podlaskie', '20', 1),
+(2641, 170, 'Pomorskie', '22', 1),
+(2642, 170, 'Slaskie', '24', 1),
+(2643, 170, 'Swietokrzyskie', '26', 1),
+(2644, 170, 'Warminsko-Mazurskie', '28', 1),
+(2645, 170, 'Wielkopolskie', '30', 1),
+(2646, 170, 'Zachodniopomorskie', '32', 1),
(2647, 198, 'Saint Pierre', 'P', 1),
(2648, 198, 'Miquelon', 'M', 1),
-(2649, 171, 'Açores', 'AC', 1),
-(2650, 171, 'Aveiro', 'AV', 1),
-(2651, 171, 'Beja', 'BE', 1),
-(2652, 171, 'Braga', 'BR', 1),
-(2653, 171, 'Bragança', 'BA', 1),
-(2654, 171, 'Castelo Branco', 'CB', 1),
-(2655, 171, 'Coimbra', 'CO', 1),
-(2656, 171, 'Évora', 'EV', 1),
-(2657, 171, 'Faro', 'FA', 1),
-(2658, 171, 'Guarda', 'GU', 1),
-(2659, 171, 'Leiria', 'LE', 1),
-(2660, 171, 'Lisboa', 'LI', 1),
-(2661, 171, 'Madeira', 'ME', 1),
-(2662, 171, 'Portalegre', 'PO', 1),
-(2663, 171, 'Porto', 'PR', 1),
-(2664, 171, 'Santarém', 'SA', 1),
-(2665, 171, 'Setúbal', 'SE', 1),
-(2666, 171, 'Viana do Castelo', 'VC', 1),
-(2667, 171, 'Vila Real', 'VR', 1),
+(2649, 171, 'Açores', '20', 1),
+(2650, 171, 'Aveiro', '01', 1),
+(2651, 171, 'Beja', '02', 1),
+(2652, 171, 'Braga', '03', 1),
+(2653, 171, 'Bragança', '04', 1),
+(2654, 171, 'Castelo Branco', '05', 1),
+(2655, 171, 'Coimbra', '06', 1),
+(2656, 171, 'Évora', '07', 1),
+(2657, 171, 'Faro', '08', 1),
+(2658, 171, 'Guarda', '09', 1),
+(2659, 171, 'Leiria', '10', 1),
+(2660, 171, 'Lisboa', '11', 1),
+(2661, 171, 'Madeira', '30', 1),
+(2662, 171, 'Portalegre', '12', 1),
+(2663, 171, 'Porto', '13', 1),
+(2664, 171, 'Santarém', '14', 1),
+(2665, 171, 'Setúbal', '15', 1),
+(2666, 171, 'Viana do Castelo', '16', 1),
+(2667, 171, 'Vila Real', '17', 1),
(2668, 171, 'Viseu', 'VI', 1),
(2669, 173, 'Ad Dawhah', 'DW', 1),
(2670, 173, 'Al Ghuwayriyah', 'GW', 1),
@@ -4896,93 +4870,6 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(2718, 175, 'Vaslui', 'VS', 1),
(2719, 175, 'Vâlcea', 'VL', 1),
(2720, 175, 'Vrancea', 'VN', 1),
-(2721, 176, 'Abakan', 'AB', 1),
-(2722, 176, 'Aginskoye', 'AG', 1),
-(2723, 176, 'Anadyr', 'AN', 1),
-(2724, 176, 'Arkahangelsk', 'AR', 1),
-(2725, 176, 'Astrakhan', 'AS', 1),
-(2726, 176, 'Barnaul', 'BA', 1),
-(2727, 176, 'Belgorod', 'BE', 1),
-(2728, 176, 'Birobidzhan', 'BI', 1),
-(2729, 176, 'Blagoveshchensk', 'BL', 1),
-(2730, 176, 'Bryansk', 'BR', 1),
-(2731, 176, 'Cheboksary', 'CH', 1),
-(2732, 176, 'Chelyabinsk', 'CL', 1),
-(2733, 176, 'Cherkessk', 'CR', 1),
-(2734, 176, 'Chita', 'CI', 1),
-(2735, 176, 'Dudinka', 'DU', 1),
-(2736, 176, 'Elista', 'EL', 1),
-(2738, 176, 'Gorno-Altaysk', 'GA', 1),
-(2739, 176, 'Groznyy', 'GR', 1),
-(2740, 176, 'Irkutsk', 'IR', 1),
-(2741, 176, 'Ivanovo', 'IV', 1),
-(2742, 176, 'Izhevsk', 'IZ', 1),
-(2743, 176, 'Kalinigrad', 'KA', 1),
-(2744, 176, 'Kaluga', 'KL', 1),
-(2745, 176, 'Kasnodar', 'KS', 1),
-(2746, 176, 'Kazan', 'KZ', 1),
-(2747, 176, 'Kemerovo', 'KE', 1),
-(2748, 176, 'Khabarovsk', 'KH', 1),
-(2749, 176, 'Khanty-Mansiysk', 'KM', 1),
-(2750, 176, 'Kostroma', 'KO', 1),
-(2751, 176, 'Krasnodar', 'KR', 1),
-(2752, 176, 'Krasnoyarsk', 'KN', 1),
-(2753, 176, 'Kudymkar', 'KU', 1),
-(2754, 176, 'Kurgan', 'KG', 1),
-(2755, 176, 'Kursk', 'KK', 1),
-(2756, 176, 'Kyzyl', 'KY', 1),
-(2757, 176, 'Lipetsk', 'LI', 1),
-(2758, 176, 'Magadan', 'MA', 1),
-(2759, 176, 'Makhachkala', 'MK', 1),
-(2760, 176, 'Maykop', 'MY', 1),
-(2761, 176, 'Moscow', 'MO', 1),
-(2762, 176, 'Murmansk', 'MU', 1),
-(2763, 176, 'Nalchik', 'NA', 1),
-(2764, 176, 'Naryan Mar', 'NR', 1),
-(2765, 176, 'Nazran', 'NZ', 1),
-(2766, 176, 'Nizhniy Novgorod', 'NI', 1),
-(2767, 176, 'Novgorod', 'NO', 1),
-(2768, 176, 'Novosibirsk', 'NV', 1),
-(2769, 176, 'Omsk', 'OM', 1),
-(2770, 176, 'Orel', 'OR', 1),
-(2771, 176, 'Orenburg', 'OE', 1),
-(2772, 176, 'Palana', 'PA', 1),
-(2773, 176, 'Penza', 'PE', 1),
-(2774, 176, 'Perm', 'PR', 1),
-(2775, 176, 'Petropavlovsk-Kamchatskiy', 'PK', 1),
-(2776, 176, 'Petrozavodsk', 'PT', 1),
-(2777, 176, 'Pskov', 'PS', 1),
-(2778, 176, 'Rostov-na-Donu', 'RO', 1),
-(2779, 176, 'Ryazan', 'RY', 1),
-(2780, 176, 'Salekhard', 'SL', 1),
-(2781, 176, 'Samara', 'SA', 1),
-(2782, 176, 'Saransk', 'SR', 1),
-(2783, 176, 'Saratov', 'SV', 1),
-(2784, 176, 'Smolensk', 'SM', 1),
-(2785, 176, 'St. Petersburg', 'SP', 1),
-(2786, 176, 'Stavropol', 'ST', 1),
-(2787, 176, 'Syktyvkar', 'SY', 1),
-(2788, 176, 'Tambov', 'TA', 1),
-(2789, 176, 'Tomsk', 'TO', 1),
-(2790, 176, 'Tula', 'TU', 1),
-(2791, 176, 'Tura', 'TR', 1),
-(2792, 176, 'Tver', 'TV', 1),
-(2793, 176, 'Tyumen', 'TY', 1),
-(2794, 176, 'Ufa', 'UF', 1),
-(2795, 176, 'Ul''yanovsk', 'UL', 1),
-(2796, 176, 'Ulan-Ude', 'UU', 1),
-(2797, 176, 'Ust''-Ordynskiy', 'US', 1),
-(2798, 176, 'Vladikavkaz', 'VL', 1),
-(2799, 176, 'Vladimir', 'VA', 1),
-(2800, 176, 'Vladivostok', 'VV', 1),
-(2801, 176, 'Volgograd', 'VG', 1),
-(2802, 176, 'Vologda', 'VD', 1),
-(2803, 176, 'Voronezh', 'VO', 1),
-(2804, 176, 'Vyatka', 'VY', 1),
-(2805, 176, 'Yakutsk', 'YA', 1),
-(2806, 176, 'Yaroslavl', 'YR', 1),
-(2807, 176, 'Yekaterinburg', 'YE', 1),
-(2808, 176, 'Yoshkar-Ola', 'YO', 1),
(2809, 177, 'Butare', 'BU', 1),
(2810, 177, 'Byumba', 'BY', 1),
(2811, 177, 'Cyangugu', 'CY', 1),
@@ -5099,13 +4986,13 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(2922, 187, 'Northern', 'N', 1),
(2923, 187, 'Southern', 'S', 1),
(2924, 187, 'Western', 'W', 1),
-(2925, 189, 'Banskobystrický', 'BA', 1),
-(2926, 189, 'Bratislavský', 'BR', 1),
-(2927, 189, 'Košický', 'KO', 1),
+(2925, 189, 'Banskobystrický', 'BC', 1),
+(2926, 189, 'Bratislavský', 'BL', 1),
+(2927, 189, 'Košický', 'KI', 1),
(2928, 189, 'Nitriansky', 'NI', 1),
-(2929, 189, 'Prešovský', 'PR', 1),
+(2929, 189, 'Prešovský', 'PV', 1),
(2930, 189, 'Trenčiansky', 'TC', 1),
-(2931, 189, 'Trnavský', 'TV', 1),
+(2931, 189, 'Trnavský', 'TA', 1),
(2932, 189, 'Žilinský', 'ZI', 1),
(2933, 191, 'Central', 'CE', 1),
(2934, 191, 'Choiseul', 'CH', 1),
@@ -5137,65 +5024,65 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(2960, 192, 'Woqooyi Galbeed', 'WG', 1),
(2961, 193, 'Eastern Cape', 'EC', 1),
(2962, 193, 'Free State', 'FS', 1),
-(2963, 193, 'Gauteng', 'GT', 1),
-(2964, 193, 'KwaZulu-Natal', 'KN', 1),
+(2963, 193, 'Gauteng', 'GP', 1),
+(2964, 193, 'KwaZulu-Natal', 'KZN', 1),
(2965, 193, 'Limpopo', 'LP', 1),
(2966, 193, 'Mpumalanga', 'MP', 1),
(2967, 193, 'North West', 'NW', 1),
(2968, 193, 'Northern Cape', 'NC', 1),
(2969, 193, 'Western Cape', 'WC', 1),
-(2970, 195, 'La Coruña', 'CA', 1),
-(2971, 195, 'Álava', 'AL', 1),
+(2970, 195, 'La Coruña', 'C', 1),
+(2971, 195, 'Álava', 'VI', 1),
(2972, 195, 'Albacete', 'AB', 1),
-(2973, 195, 'Alicante', 'AC', 1),
-(2974, 195, 'Almeria', 'AM', 1),
-(2975, 195, 'Asturias', 'AS', 1),
+(2973, 195, 'Alicante', 'A', 1),
+(2974, 195, 'Almeria', 'AL', 1),
+(2975, 195, 'Asturias', 'O', 1),
(2976, 195, 'Ávila', 'AV', 1),
-(2977, 195, 'Badajoz', 'BJ', 1),
+(2977, 195, 'Badajoz', 'BA', 1),
(2978, 195, 'Baleares', 'IB', 1),
-(2979, 195, 'Barcelona', 'BA', 1),
+(2979, 195, 'Barcelona', 'B', 1),
(2980, 195, 'Burgos', 'BU', 1),
(2981, 195, 'Cáceres', 'CC', 1),
-(2982, 195, 'Cádiz', 'CZ', 1),
-(2983, 195, 'Cantabria', 'CT', 1),
-(2984, 195, 'Castellón', 'CL', 1),
+(2982, 195, 'Cádiz', 'CA', 1),
+(2983, 195, 'Cantabria', 'S', 1),
+(2984, 195, 'Castellón', 'CS', 1),
(2985, 195, 'Ceuta', 'CE', 1),
(2986, 195, 'Ciudad Real', 'CR', 1),
-(2987, 195, 'Córdoba', 'CD', 1),
+(2987, 195, 'Córdoba', 'CO', 1),
(2988, 195, 'Cuenca', 'CU', 1),
(2989, 195, 'Girona', 'GI', 1),
-(2990, 195, 'Granada', 'GD', 1),
-(2991, 195, 'Guadalajara', 'GJ', 1),
-(2992, 195, 'Guipúzcoa', 'GP', 1),
-(2993, 195, 'Huelva', 'HL', 1),
-(2994, 195, 'Huesca', 'HS', 1),
-(2995, 195, 'Jaén', 'JN', 1),
-(2996, 195, 'La Rioja', 'RJ', 1),
-(2997, 195, 'Las Palmas', 'PM', 1),
-(2998, 195, 'Leon', 'LE', 1),
-(2999, 195, 'Lleida', 'LL', 1),
-(3000, 195, 'Lugo', 'LG', 1),
-(3001, 195, 'Madrid', 'MD', 1),
+(2990, 195, 'Granada', 'GR', 1),
+(2991, 195, 'Guadalajara', 'GU', 1),
+(2992, 195, 'Guipúzcoa', 'SS', 1),
+(2993, 195, 'Huelva', 'H', 1),
+(2994, 195, 'Huesca', 'HU', 1),
+(2995, 195, 'Jaén', 'J', 1),
+(2996, 195, 'La Rioja', 'LO', 1),
+(2997, 195, 'Las Palmas', 'GC', 1),
+(2998, 195, 'Leon', 'CL', 1),
+(2999, 195, 'Lleida', 'L', 1),
+(3000, 195, 'Lugo', 'LU', 1),
+(3001, 195, 'Madrid', 'M', 1),
(3002, 195, 'Malaga', 'MA', 1),
(3003, 195, 'Melilla', 'ML', 1),
(3004, 195, 'Murcia', 'MU', 1),
-(3005, 195, 'Navarra', 'NV', 1),
-(3006, 195, 'Ourense', 'OU', 1),
-(3007, 195, 'Palencia', 'PL', 1),
+(3005, 195, 'Navarra', 'NA', 1),
+(3006, 195, 'Ourense', 'OR', 1),
+(3007, 195, 'Palencia', 'P', 1),
(3008, 195, 'Pontevedra', 'PO', 1),
-(3009, 195, 'Salamanca', 'SL', 1),
-(3010, 195, 'Santa Cruz de Tenerife', 'SC', 1),
+(3009, 195, 'Salamanca', 'SA', 1),
+(3010, 195, 'Santa Cruz de Tenerife', 'TF', 1),
(3011, 195, 'Segovia', 'SG', 1),
-(3012, 195, 'Sevilla', 'SV', 1),
+(3012, 195, 'Sevilla', 'SE', 1),
(3013, 195, 'Soria', 'SO', 1),
-(3014, 195, 'Tarragona', 'TA', 1),
+(3014, 195, 'Tarragona', 'T', 1),
(3015, 195, 'Teruel', 'TE', 1),
(3016, 195, 'Toledo', 'TO', 1),
-(3017, 195, 'Valencia', 'VC', 1),
-(3018, 195, 'Valladolid', 'VD', 1),
-(3019, 195, 'Vizcaya', 'VZ', 1),
-(3020, 195, 'Zamora', 'ZM', 1),
-(3021, 195, 'Zaragoza', 'ZR', 1),
+(3017, 195, 'Valencia', 'V', 1),
+(3018, 195, 'Valladolid', 'VA', 1),
+(3019, 195, 'Bizkaia', 'BI', 1),
+(3020, 195, 'Zamora', 'ZA', 1),
+(3021, 195, 'Zaragoza', 'Z', 1),
(3022, 196, 'Central', 'CE', 1),
(3023, 196, 'Eastern', 'EA', 1),
(3024, 196, 'North Central', 'NC', 1),
@@ -5362,82 +5249,81 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(3186, 208, 'Zanzibar Central/South', 'ZC', 1),
(3187, 208, 'Zanzibar North', 'ZN', 1),
(3188, 208, 'Zanzibar Urban/West', 'ZU', 1),
-(3189, 209, 'Amnat Charoen', 'Amnat Charoen', 1),
-(3190, 209, 'Ang Thong', 'Ang Thong', 1),
-(3191, 209, 'Ayutthaya', 'Ayutthaya', 1),
-(3192, 209, 'Bangkok', 'Bangkok', 1),
-(3193, 209, 'Buriram', 'Buriram', 1),
-(3194, 209, 'Chachoengsao', 'Chachoengsao', 1),
-(3195, 209, 'Chai Nat', 'Chai Nat', 1),
-(3196, 209, 'Chaiyaphum', 'Chaiyaphum', 1),
-(3197, 209, 'Chanthaburi', 'Chanthaburi', 1),
-(3198, 209, 'Chiang Mai', 'Chiang Mai', 1),
-(3199, 209, 'Chiang Rai', 'Chiang Rai', 1),
-(3200, 209, 'Chon Buri', 'Chon Buri', 1),
-(3201, 209, 'Chumphon', 'Chumphon', 1),
-(3202, 209, 'Kalasin', 'Kalasin', 1),
-(3203, 209, 'Kamphaeng Phet', 'Kamphaeng Phet', 1),
-(3204, 209, 'Kanchanaburi', 'Kanchanaburi', 1),
-(3205, 209, 'Khon Kaen', 'Khon Kaen', 1),
-(3206, 209, 'Krabi', 'Krabi', 1),
-(3207, 209, 'Lampang', 'Lampang', 1),
-(3208, 209, 'Lamphun', 'Lamphun', 1),
-(3209, 209, 'Loei', 'Loei', 1),
-(3210, 209, 'Lop Buri', 'Lop Buri', 1),
-(3211, 209, 'Mae Hong Son', 'Mae Hong Son', 1),
-(3212, 209, 'Maha Sarakham', 'Maha Sarakham', 1),
-(3213, 209, 'Mukdahan', 'Mukdahan', 1),
-(3214, 209, 'Nakhon Nayok', 'Nakhon Nayok', 1),
-(3215, 209, 'Nakhon Pathom', 'Nakhon Pathom', 1),
-(3216, 209, 'Nakhon Phanom', 'Nakhon Phanom', 1),
-(3217, 209, 'Nakhon Ratchasima', 'Nakhon Ratchasima', 1),
-(3218, 209, 'Nakhon Sawan', 'Nakhon Sawan', 1),
-(3219, 209, 'Nakhon Si Thammarat', 'Nakhon Si Thammarat', 1),
-(3220, 209, 'Nan', 'Nan', 1),
-(3221, 209, 'Narathiwat', 'Narathiwat', 1),
-(3222, 209, 'Nong Bua Lamphu', 'Nong Bua Lamphu', 1),
-(3223, 209, 'Nong Khai', 'Nong Khai', 1),
-(3224, 209, 'Nonthaburi', 'Nonthaburi', 1),
-(3225, 209, 'Pathum Thani', 'Pathum Thani', 1),
-(3226, 209, 'Pattani', 'Pattani', 1),
-(3227, 209, 'Phangnga', 'Phangnga', 1),
-(3228, 209, 'Phatthalung', 'Phatthalung', 1),
+(3189, 209, 'Amnat Charoen', '37', 1),
+(3190, 209, 'Ang Thong', '15', 1),
+(3192, 209, 'Bangkok', '10', 1),
+(3193, 209, 'Buri Ram', '31', 1),
+(3194, 209, 'Chachoengsao', '24', 1),
+(3195, 209, 'Chai Nat', '18', 1),
+(3196, 209, 'Chaiyaphum', '36', 1),
+(3197, 209, 'Chanthaburi', '22', 1),
+(3198, 209, 'Chiang Mai', '50', 1),
+(3199, 209, 'Chiang Rai', '57', 1),
+(3200, 209, 'Chon Buri', '20', 1),
+(3201, 209, 'Chumphon', '86', 1),
+(3202, 209, 'Kalasin', '46', 1),
+(3203, 209, 'Kamphaeng Phet', '62', 1),
+(3204, 209, 'Kanchanaburi', '71', 1),
+(3205, 209, 'Khon Kaen', '40', 1),
+(3206, 209, 'Krabi', '81', 1),
+(3207, 209, 'Lampang', '52', 1),
+(3208, 209, 'Lamphun', '51', 1),
+(3209, 209, 'Loei', '42', 1),
+(3210, 209, 'Lop Buri', '1', 1),
+(3211, 209, 'Mae Hong Son', '55', 1),
+(3212, 209, 'Maha Sarakham', '44', 1),
+(3213, 209, 'Mukdahan', '49', 1),
+(3214, 209, 'Nakhon Nayok', '26', 1),
+(3215, 209, 'Nakhon Pathom', '73', 1),
+(3216, 209, 'Nakhon Phanom', '48', 1),
+(3217, 209, 'Nakhon Ratchasima', '30', 1),
+(3218, 209, 'Nakhon Sawan', '60', 1),
+(3219, 209, 'Nakhon Si Thammarat', '80', 1),
+(3220, 209, 'Nan', '55', 1),
+(3221, 209, 'Narathiwat', '96', 1),
+(3222, 209, 'Nong Bua Lamphu', '39', 1),
+(3223, 209, 'Nong Khai', '43', 1),
+(3224, 209, 'Nonthaburi', '12', 1),
+(3225, 209, 'Pathum Thani', '13', 1),
+(3226, 209, 'Pattani', '94', 1),
+(3227, 209, 'Phangnga', '82', 1),
+(3228, 209, 'Phatthalung', '93', 1),
(3229, 209, 'Phayao', 'Phayao', 1),
-(3230, 209, 'Phetchabun', 'Phetchabun', 1),
-(3231, 209, 'Phetchaburi', 'Phetchaburi', 1),
-(3232, 209, 'Phichit', 'Phichit', 1),
-(3233, 209, 'Phitsanulok', 'Phitsanulok', 1),
-(3234, 209, 'Phrae', 'Phrae', 1),
-(3235, 209, 'Phuket', 'Phuket', 1),
-(3236, 209, 'Prachin Buri', 'Prachin Buri', 1),
-(3237, 209, 'Prachuap Khiri Khan', 'Prachuap Khiri Khan', 1),
-(3238, 209, 'Ranong', 'Ranong', 1),
-(3239, 209, 'Ratchaburi', 'Ratchaburi', 1),
-(3240, 209, 'Rayong', 'Rayong', 1),
-(3241, 209, 'Roi Et', 'Roi Et', 1),
-(3242, 209, 'Sa Kaeo', 'Sa Kaeo', 1),
-(3243, 209, 'Sakon Nakhon', 'Sakon Nakhon', 1),
-(3244, 209, 'Samut Prakan', 'Samut Prakan', 1),
-(3245, 209, 'Samut Sakhon', 'Samut Sakhon', 1),
-(3246, 209, 'Samut Songkhram', 'Samut Songkhram', 1),
-(3247, 209, 'Sara Buri', 'Sara Buri', 1),
-(3248, 209, 'Satun', 'Satun', 1),
-(3249, 209, 'Sing Buri', 'Sing Buri', 1),
-(3250, 209, 'Sisaket', 'Sisaket', 1),
-(3251, 209, 'Songkhla', 'Songkhla', 1),
-(3252, 209, 'Sukhothai', 'Sukhothai', 1),
-(3253, 209, 'Suphan Buri', 'Suphan Buri', 1),
-(3254, 209, 'Surat Thani', 'Surat Thani', 1),
-(3255, 209, 'Surin', 'Surin', 1),
-(3256, 209, 'Tak', 'Tak', 1),
-(3257, 209, 'Trang', 'Trang', 1),
-(3258, 209, 'Trat', 'Trat', 1),
-(3259, 209, 'Ubon Ratchathani', 'Ubon Ratchathani', 1),
-(3260, 209, 'Udon Thani', 'Udon Thani', 1),
-(3261, 209, 'Uthai Thani', 'Uthai Thani', 1),
-(3262, 209, 'Uttaradit', 'Uttaradit', 1),
-(3263, 209, 'Yala', 'Yala', 1),
-(3264, 209, 'Yasothon', 'Yasothon', 1),
+(3230, 209, 'Phetchabun', '67', 1),
+(3231, 209, 'Phetchaburi', '76', 1),
+(3232, 209, 'Phichit', '66', 1),
+(3233, 209, 'Phitsanulok', '65', 1),
+(3234, 209, 'Phrae', '54', 1),
+(3235, 209, 'Phuket', '83', 1),
+(3236, 209, 'Prachin Buri', '25', 1),
+(3237, 209, 'Prachuap Khiri Khan', '77', 1),
+(3238, 209, 'Ranong', '21', 1),
+(3239, 209, 'Ratchaburi', '70', 1),
+(3240, 209, 'Rayong', '21', 1),
+(3241, 209, 'Roi Et', '45', 1),
+(3242, 209, 'Sa Kaeo', '27', 1),
+(3243, 209, 'Sakon Nakhon', '47', 1),
+(3244, 209, 'Samut Prakan', '11', 1),
+(3245, 209, 'Samut Sakhon', '74', 1),
+(3246, 209, 'Samut Songkhram', '75', 1),
+(3247, 209, 'Saraburi', '19', 1),
+(3248, 209, 'Satun', '91', 1),
+(3249, 209, 'Sing Buri', '17', 1),
+(3250, 209, 'Si Sa Ket', '33', 1),
+(3251, 209, 'Songkhla', '90', 1),
+(3252, 209, 'Sukhothai', '64', 1),
+(3253, 209, 'Suphan Buri', '72', 1),
+(3254, 209, 'Surat Thani', '84', 1),
+(3255, 209, 'Surin', '32', 1),
+(3256, 209, 'Tak', '63', 1),
+(3257, 209, 'Trang', '92', 1),
+(3258, 209, 'Trat', '23', 1),
+(3259, 209, 'Ubon Ratchathani', '34', 1),
+(3260, 209, 'Udon Thani', '41', 1),
+(3261, 209, 'Uthai Thani', '61', 1),
+(3262, 209, 'Uttaradit', '53', 1),
+(3263, 209, 'Yala', '95', 1),
+(3264, 209, 'Yasothon', '35', 1),
(3265, 210, 'Kara', 'K', 1),
(3266, 210, 'Plateaux', 'P', 1),
(3267, 210, 'Savanes', 'S', 1),
@@ -5899,31 +5785,31 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(3723, 227, 'Shefa', 'SH', 1),
(3724, 227, 'Tafea', 'TA', 1),
(3725, 227, 'Torba', 'TO', 1),
-(3726, 229, 'Amazonas', 'AM', 1),
-(3727, 229, 'Anzoategui', 'AN', 1),
-(3728, 229, 'Apure', 'AP', 1),
-(3729, 229, 'Aragua', 'AR', 1),
-(3730, 229, 'Barinas', 'BA', 1),
-(3731, 229, 'Bolivar', 'BO', 1),
-(3732, 229, 'Carabobo', 'CA', 1),
-(3733, 229, 'Cojedes', 'CO', 1),
-(3734, 229, 'Delta Amacuro', 'DA', 1),
-(3735, 229, 'Dependencias Federales', 'DF', 1),
-(3736, 229, 'Distrito Federal', 'DI', 1),
-(3737, 229, 'Falcon', 'FA', 1),
-(3738, 229, 'Guarico', 'GU', 1),
-(3739, 229, 'Lara', 'LA', 1),
-(3740, 229, 'Merida', 'ME', 1),
-(3741, 229, 'Miranda', 'MI', 1),
-(3742, 229, 'Monagas', 'MO', 1),
-(3743, 229, 'Nueva Esparta', 'NE', 1),
-(3744, 229, 'Portuguesa', 'PO', 1),
-(3745, 229, 'Sucre', 'SU', 1),
-(3746, 229, 'Tachira', 'TA', 1),
-(3747, 229, 'Trujillo', 'TR', 1),
-(3748, 229, 'Vargas', 'VA', 1),
-(3749, 229, 'Yaracuy', 'YA', 1),
-(3750, 229, 'Zulia', 'ZU', 1),
+(3726, 229, 'Amazonas', 'Z', 1),
+(3727, 229, 'Anzoategui', 'B', 1),
+(3728, 229, 'Apure', 'C', 1),
+(3729, 229, 'Aragua', 'D', 1),
+(3730, 229, 'Barinas', 'E', 1),
+(3731, 229, 'Bolivar', 'F', 1),
+(3732, 229, 'Carabobo', 'G', 1),
+(3733, 229, 'Cojedes', 'H', 1),
+(3734, 229, 'Delta Amacuro', 'Y', 1),
+(3735, 229, 'Dependencias Federales', 'W', 1),
+(3736, 229, 'Distrito Capital', 'A', 1),
+(3737, 229, 'Falcon', 'I', 1),
+(3738, 229, 'Guarico', 'J', 1),
+(3739, 229, 'Lara', 'K', 1),
+(3740, 229, 'Merida', 'L', 1),
+(3741, 229, 'Miranda', 'M', 1),
+(3742, 229, 'Monagas', 'N', 1),
+(3743, 229, 'Nueva Esparta', 'O', 1),
+(3744, 229, 'Portuguesa', 'P', 1),
+(3745, 229, 'Sucre', 'R', 1),
+(3746, 229, 'Tachira', 'S', 1),
+(3747, 229, 'Trujillo', 'T', 1),
+(3748, 229, 'Vargas', 'X', 1),
+(3749, 229, 'Yaracuy', 'U', 1),
+(3750, 229, 'Zulia', 'V', 1),
(3751, 230, 'An Giang', 'AG', 1),
(3752, 230, 'Bac Giang', 'BG', 1),
(3753, 230, 'Bac Kan', 'BK', 1),
@@ -6177,192 +6063,124 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(4030, 248, 'Warrap', 'WR', 1),
(4031, 248, 'Western Bahr el-Ghazal', 'BW', 1),
(4032, 248, 'Western Equatoria', 'EW', 1),
-(4036, 117, 'Ainaži, Salacgrīvas novads', '0661405', 1),
-(4037, 117, 'Aizkraukle, Aizkraukles novads', '0320201', 1),
-(4038, 117, 'Aizkraukles novads', '0320200', 1),
-(4039, 117, 'Aizpute, Aizputes novads', '0640605', 1),
-(4040, 117, 'Aizputes novads', '0640600', 1),
-(4041, 117, 'Aknīste, Aknīstes novads', '0560805', 1),
-(4042, 117, 'Aknīstes novads', '0560800', 1),
-(4043, 117, 'Aloja, Alojas novads', '0661007', 1),
-(4044, 117, 'Alojas novads', '0661000', 1),
-(4045, 117, 'Alsungas novads', '0624200', 1),
-(4046, 117, 'Alūksne, Alūksnes novads', '0360201', 1),
-(4047, 117, 'Alūksnes novads', '0360200', 1),
-(4048, 117, 'Amatas novads', '0424701', 1),
-(4049, 117, 'Ape, Apes novads', '0360805', 1),
-(4050, 117, 'Apes novads', '0360800', 1),
-(4051, 117, 'Auce, Auces novads', '0460805', 1),
-(4052, 117, 'Auces novads', '0460800', 1),
-(4053, 117, 'Ādažu novads', '0804400', 1),
-(4054, 117, 'Babītes novads', '0804900', 1),
-(4055, 117, 'Baldone, Baldones novads', '0800605', 1),
-(4056, 117, 'Baldones novads', '0800600', 1),
-(4057, 117, 'Baloži, Ķekavas novads', '0800807', 1),
-(4058, 117, 'Baltinavas novads', '0384400', 1),
-(4059, 117, 'Balvi, Balvu novads', '0380201', 1),
-(4060, 117, 'Balvu novads', '0380200', 1),
-(4061, 117, 'Bauska, Bauskas novads', '0400201', 1),
-(4062, 117, 'Bauskas novads', '0400200', 1),
-(4063, 117, 'Beverīnas novads', '0964700', 1),
-(4064, 117, 'Brocēni, Brocēnu novads', '0840605', 1),
-(4065, 117, 'Brocēnu novads', '0840601', 1),
-(4066, 117, 'Burtnieku novads', '0967101', 1),
-(4067, 117, 'Carnikavas novads', '0805200', 1),
-(4068, 117, 'Cesvaine, Cesvaines novads', '0700807', 1),
-(4069, 117, 'Cesvaines novads', '0700800', 1),
-(4070, 117, 'Cēsis, Cēsu novads', '0420201', 1),
-(4071, 117, 'Cēsu novads', '0420200', 1),
-(4072, 117, 'Ciblas novads', '0684901', 1),
-(4073, 117, 'Dagda, Dagdas novads', '0601009', 1),
-(4074, 117, 'Dagdas novads', '0601000', 1),
-(4075, 117, 'Daugavpils', '0050000', 1),
-(4076, 117, 'Daugavpils novads', '0440200', 1),
-(4077, 117, 'Dobele, Dobeles novads', '0460201', 1),
-(4078, 117, 'Dobeles novads', '0460200', 1),
-(4079, 117, 'Dundagas novads', '0885100', 1),
-(4080, 117, 'Durbe, Durbes novads', '0640807', 1),
-(4081, 117, 'Durbes novads', '0640801', 1),
-(4082, 117, 'Engures novads', '0905100', 1),
-(4083, 117, 'Ērgļu novads', '0705500', 1),
-(4084, 117, 'Garkalnes novads', '0806000', 1),
-(4085, 117, 'Grobiņa, Grobiņas novads', '0641009', 1),
-(4086, 117, 'Grobiņas novads', '0641000', 1),
-(4087, 117, 'Gulbene, Gulbenes novads', '0500201', 1),
-(4088, 117, 'Gulbenes novads', '0500200', 1),
-(4089, 117, 'Iecavas novads', '0406400', 1),
-(4090, 117, 'Ikšķile, Ikšķiles novads', '0740605', 1),
-(4091, 117, 'Ikšķiles novads', '0740600', 1),
-(4092, 117, 'Ilūkste, Ilūkstes novads', '0440807', 1),
-(4093, 117, 'Ilūkstes novads', '0440801', 1),
-(4094, 117, 'Inčukalna novads', '0801800', 1),
-(4095, 117, 'Jaunjelgava, Jaunjelgavas novads', '0321007', 1),
-(4096, 117, 'Jaunjelgavas novads', '0321000', 1),
-(4097, 117, 'Jaunpiebalgas novads', '0425700', 1),
-(4098, 117, 'Jaunpils novads', '0905700', 1),
-(4099, 117, 'Jelgava', '0090000', 1),
-(4100, 117, 'Jelgavas novads', '0540200', 1),
-(4101, 117, 'Jēkabpils', '0110000', 1),
-(4102, 117, 'Jēkabpils novads', '0560200', 1),
-(4103, 117, 'Jūrmala', '0130000', 1),
-(4104, 117, 'Kalnciems, Jelgavas novads', '0540211', 1),
-(4105, 117, 'Kandava, Kandavas novads', '0901211', 1),
-(4106, 117, 'Kandavas novads', '0901201', 1),
-(4107, 117, 'Kārsava, Kārsavas novads', '0681009', 1),
-(4108, 117, 'Kārsavas novads', '0681000', 1),
-(4109, 117, 'Kocēnu novads ,bij. Valmieras)', '0960200', 1),
-(4110, 117, 'Kokneses novads', '0326100', 1),
-(4111, 117, 'Krāslava, Krāslavas novads', '0600201', 1),
-(4112, 117, 'Krāslavas novads', '0600202', 1),
-(4113, 117, 'Krimuldas novads', '0806900', 1),
-(4114, 117, 'Krustpils novads', '0566900', 1),
-(4115, 117, 'Kuldīga, Kuldīgas novads', '0620201', 1),
-(4116, 117, 'Kuldīgas novads', '0620200', 1),
-(4117, 117, 'Ķeguma novads', '0741001', 1),
-(4118, 117, 'Ķegums, Ķeguma novads', '0741009', 1),
-(4119, 117, 'Ķekavas novads', '0800800', 1),
-(4120, 117, 'Lielvārde, Lielvārdes novads', '0741413', 1),
-(4121, 117, 'Lielvārdes novads', '0741401', 1),
-(4122, 117, 'Liepāja', '0170000', 1),
-(4123, 117, 'Limbaži, Limbažu novads', '0660201', 1),
-(4124, 117, 'Limbažu novads', '0660200', 1),
-(4125, 117, 'Līgatne, Līgatnes novads', '0421211', 1),
-(4126, 117, 'Līgatnes novads', '0421200', 1),
-(4127, 117, 'Līvāni, Līvānu novads', '0761211', 1),
-(4128, 117, 'Līvānu novads', '0761201', 1),
-(4129, 117, 'Lubāna, Lubānas novads', '0701413', 1),
-(4130, 117, 'Lubānas novads', '0701400', 1),
-(4131, 117, 'Ludza, Ludzas novads', '0680201', 1),
-(4132, 117, 'Ludzas novads', '0680200', 1),
-(4133, 117, 'Madona, Madonas novads', '0700201', 1),
-(4134, 117, 'Madonas novads', '0700200', 1),
-(4135, 117, 'Mazsalaca, Mazsalacas novads', '0961011', 1),
-(4136, 117, 'Mazsalacas novads', '0961000', 1),
-(4137, 117, 'Mālpils novads', '0807400', 1),
-(4138, 117, 'Mārupes novads', '0807600', 1),
-(4139, 117, 'Mērsraga novads', '0887600', 1),
-(4140, 117, 'Naukšēnu novads', '0967300', 1),
-(4141, 117, 'Neretas novads', '0327100', 1),
-(4142, 117, 'Nīcas novads', '0647900', 1),
-(4143, 117, 'Ogre, Ogres novads', '0740201', 1),
-(4144, 117, 'Ogres novads', '0740202', 1),
-(4145, 117, 'Olaine, Olaines novads', '0801009', 1),
-(4146, 117, 'Olaines novads', '0801000', 1),
-(4147, 117, 'Ozolnieku novads', '0546701', 1),
-(4148, 117, 'Pārgaujas novads', '0427500', 1),
-(4149, 117, 'Pāvilosta, Pāvilostas novads', '0641413', 1),
-(4150, 117, 'Pāvilostas novads', '0641401', 1),
-(4151, 117, 'Piltene, Ventspils novads', '0980213', 1),
-(4152, 117, 'Pļaviņas, Pļaviņu novads', '0321413', 1),
-(4153, 117, 'Pļaviņu novads', '0321400', 1),
-(4154, 117, 'Preiļi, Preiļu novads', '0760201', 1),
-(4155, 117, 'Preiļu novads', '0760202', 1),
-(4156, 117, 'Priekule, Priekules novads', '0641615', 1),
-(4157, 117, 'Priekules novads', '0641600', 1),
-(4158, 117, 'Priekuļu novads', '0427300', 1),
-(4159, 117, 'Raunas novads', '0427700', 1),
-(4160, 117, 'Rēzekne', '0210000', 1),
-(4161, 117, 'Rēzeknes novads', '0780200', 1),
-(4162, 117, 'Riebiņu novads', '0766300', 1),
-(4163, 117, 'Rīga', '0010000', 1),
-(4164, 117, 'Rojas novads', '0888300', 1),
-(4165, 117, 'Ropažu novads', '0808400', 1),
-(4166, 117, 'Rucavas novads', '0648500', 1),
-(4167, 117, 'Rugāju novads', '0387500', 1),
-(4168, 117, 'Rundāles novads', '0407700', 1),
-(4169, 117, 'Rūjiena, Rūjienas novads', '0961615', 1),
-(4170, 117, 'Rūjienas novads', '0961600', 1),
-(4171, 117, 'Sabile, Talsu novads', '0880213', 1),
-(4172, 117, 'Salacgrīva, Salacgrīvas novads', '0661415', 1),
-(4173, 117, 'Salacgrīvas novads', '0661400', 1),
-(4174, 117, 'Salas novads', '0568700', 1),
-(4175, 117, 'Salaspils novads', '0801200', 1),
-(4176, 117, 'Salaspils, Salaspils novads', '0801211', 1),
-(4177, 117, 'Saldus novads', '0840200', 1),
+(4038, 117, 'Aizkraukles novads', '002', 1),
+(4040, 117, 'Aizputes novads', '003', 1),
+(4042, 117, 'Aknīstes novads', '004', 1),
+(4044, 117, 'Alojas novads', '005', 1),
+(4045, 117, 'Alsungas novads', '006', 1),
+(4047, 117, 'Alūksnes novads', '007', 1),
+(4048, 117, 'Amatas novads', '008', 1),
+(4050, 117, 'Apes novads', '008', 1),
+(4052, 117, 'Auces novads', '010', 1),
+(4053, 117, 'Ādažu novads', '011', 1),
+(4054, 117, 'Babītes novads', '012', 1),
+(4056, 117, 'Baldones novads', '013', 1),
+(4058, 117, 'Baltinavas novads', '014', 1),
+(4060, 117, 'Balvu novads', '015', 1),
+(4062, 117, 'Bauskas novads', '016', 1),
+(4063, 117, 'Beverīnas novads', '017', 1),
+(4065, 117, 'Brocēnu novads', '018', 1),
+(4066, 117, 'Burtnieku novads', '019', 1),
+(4067, 117, 'Carnikavas novads', '020', 1),
+(4069, 117, 'Cesvaines novads', '021', 1),
+(4071, 117, 'Cēsu novads', '022', 1),
+(4072, 117, 'Ciblas novads', '023', 1),
+(4074, 117, 'Dagdas novads', '024', 1),
+(4075, 117, 'Daugavpils', 'DGV', 1),
+(4076, 117, 'Daugavpils novads', '025', 1),
+(4078, 117, 'Dobeles novads', '026', 1),
+(4079, 117, 'Dundagas novads', '027', 1),
+(4081, 117, 'Durbes novads', '028', 1),
+(4082, 117, 'Engures novads', '029', 1),
+(4083, 117, 'Ērgļu novads', '030', 1),
+(4084, 117, 'Garkalnes novads', '031', 1),
+(4086, 117, 'Grobiņas novads', '032', 1),
+(4088, 117, 'Gulbenes novads', '033', 1),
+(4089, 117, 'Iecavas novads', '034', 1),
+(4091, 117, 'Ikšķiles novads', '035', 1),
+(4093, 117, 'Ilūkstes novads', '036', 1),
+(4094, 117, 'Inčukalna novads', '037', 1),
+(4096, 117, 'Jaunjelgavas novads', '038', 1),
+(4097, 117, 'Jaunpiebalgas novads', '039', 1),
+(4098, 117, 'Jaunpils novads', '040', 1),
+(4099, 117, 'Jelgava', 'JEL', 1),
+(4100, 117, 'Jelgavas novads', '041', 1),
+(4101, 117, 'Jēkabpils', 'JKB', 1),
+(4102, 117, 'Jēkabpils novads', '042', 1),
+(4103, 117, 'Jūrmala', 'JUR', 1),
+(4106, 117, 'Kandavas novads', '043', 1),
+(4108, 117, 'Kārsavas novads', '044', 1),
+(4110, 117, 'Kokneses novads', '046', 1),
+(4112, 117, 'Krāslavas novads', '047', 1),
+(4113, 117, 'Krimuldas novads', '048', 1),
+(4114, 117, 'Krustpils novads', '049', 1),
+(4116, 117, 'Kuldīgas novads', '050', 1),
+(4117, 117, 'Ķeguma novads', '051', 1),
+(4119, 117, 'Ķekavas novads', '052', 1),
+(4121, 117, 'Lielvārdes novads', '053', 1),
+(4122, 117, 'Liepāja', 'LPX', 1),
+(4124, 117, 'Limbažu novads', '054', 1),
+(4126, 117, 'Līgatnes novads', '055', 1),
+(4128, 117, 'Līvānu novads', '056', 1),
+(4130, 117, 'Lubānas novads', '057', 1),
+(4132, 117, 'Ludzas novads', '058', 1),
+(4134, 117, 'Madonas novads', '059', 1),
+(4136, 117, 'Mazsalacas novads', '060', 1),
+(4137, 117, 'Mālpils novads', '061', 1),
+(4138, 117, 'Mārupes novads', '062', 1),
+(4139, 117, 'Mērsraga novads', '063', 1),
+(4140, 117, 'Naukšēnu novads', '064', 1),
+(4141, 117, 'Neretas novads', '065', 1),
+(4142, 117, 'Nīcas novads', '066', 1),
+(4144, 117, 'Ogres novads', '067', 1),
+(4146, 117, 'Olaines novads', '068', 1),
+(4147, 117, 'Ozolnieku novads', '069', 1),
+(4148, 117, 'Pārgaujas novads', '070', 1),
+(4150, 117, 'Pāvilostas novads', '071', 1),
+(4153, 117, 'Pļaviņu novads', '072', 1),
+(4155, 117, 'Preiļu novads', '073', 1),
+(4157, 117, 'Priekules novads', '074', 1),
+(4158, 117, 'Priekuļu novads', '075', 1),
+(4159, 117, 'Raunas novads', '076', 1),
+(4160, 117, 'Rēzekne', 'REZ', 1),
+(4161, 117, 'Rēzeknes novads', '077', 1),
+(4162, 117, 'Riebiņu novads', '078', 1),
+(4163, 117, 'Rīga', 'RIX', 1),
+(4164, 117, 'Rojas novads', '079', 1),
+(4165, 117, 'Ropažu novads', '080', 1),
+(4166, 117, 'Rucavas novads', '081', 1),
+(4167, 117, 'Rugāju novads', '082', 1),
+(4168, 117, 'Rundāles novads', '083', 1),
+(4170, 117, 'Rūjienas novads', '084', 1),
+(4173, 117, 'Salacgrīvas novads', '086', 1),
+(4174, 117, 'Salas novads', '085', 1),
+(4175, 117, 'Salaspils novads', '087', 1),
+(4177, 117, 'Saldus novads', '088', 1),
(4178, 117, 'Saldus, Saldus novads', '0840201', 1),
-(4179, 117, 'Saulkrasti, Saulkrastu novads', '0801413', 1),
-(4180, 117, 'Saulkrastu novads', '0801400', 1),
-(4181, 117, 'Seda, Strenču novads', '0941813', 1),
-(4182, 117, 'Sējas novads', '0809200', 1),
-(4183, 117, 'Sigulda, Siguldas novads', '0801615', 1),
-(4184, 117, 'Siguldas novads', '0801601', 1),
-(4185, 117, 'Skrīveru novads', '0328200', 1),
-(4186, 117, 'Skrunda, Skrundas novads', '0621209', 1),
-(4187, 117, 'Skrundas novads', '0621200', 1),
-(4188, 117, 'Smiltene, Smiltenes novads', '0941615', 1),
-(4189, 117, 'Smiltenes novads', '0941600', 1),
-(4190, 117, 'Staicele, Alojas novads', '0661017', 1),
-(4191, 117, 'Stende, Talsu novads', '0880215', 1),
-(4192, 117, 'Stopiņu novads', '0809600', 1),
-(4193, 117, 'Strenči, Strenču novads', '0941817', 1),
-(4194, 117, 'Strenču novads', '0941800', 1),
-(4195, 117, 'Subate, Ilūkstes novads', '0440815', 1),
-(4196, 117, 'Talsi, Talsu novads', '0880201', 1),
-(4197, 117, 'Talsu novads', '0880200', 1),
-(4198, 117, 'Tērvetes novads', '0468900', 1),
-(4199, 117, 'Tukuma novads', '0900200', 1),
-(4200, 117, 'Tukums, Tukuma novads', '0900201', 1),
-(4201, 117, 'Vaiņodes novads', '0649300', 1),
-(4202, 117, 'Valdemārpils, Talsu novads', '0880217', 1),
-(4203, 117, 'Valka, Valkas novads', '0940201', 1),
-(4204, 117, 'Valkas novads', '0940200', 1),
-(4205, 117, 'Valmiera', '0250000', 1),
-(4206, 117, 'Vangaži, Inčukalna novads', '0801817', 1),
-(4207, 117, 'Varakļāni, Varakļānu novads', '0701817', 1),
-(4208, 117, 'Varakļānu novads', '0701800', 1),
-(4209, 117, 'Vārkavas novads', '0769101', 1),
-(4210, 117, 'Vecpiebalgas novads', '0429300', 1),
-(4211, 117, 'Vecumnieku novads', '0409500', 1),
-(4212, 117, 'Ventspils', '0270000', 1),
-(4213, 117, 'Ventspils novads', '0980200', 1),
-(4214, 117, 'Viesīte, Viesītes novads', '0561815', 1),
-(4215, 117, 'Viesītes novads', '0561800', 1),
-(4216, 117, 'Viļaka, Viļakas novads', '0381615', 1),
-(4217, 117, 'Viļakas novads', '0381600', 1),
-(4218, 117, 'Viļāni, Viļānu novads', '0781817', 1),
-(4219, 117, 'Viļānu novads', '0781800', 1),
-(4220, 117, 'Zilupe, Zilupes novads', '0681817', 1),
-(4221, 117, 'Zilupes novads', '0681801', 1),
+(4180, 117, 'Saulkrastu novads', '089', 1),
+(4182, 117, 'Sējas novads', '090', 1),
+(4184, 117, 'Siguldas novads', '091', 1),
+(4185, 117, 'Skrīveru novads', '092', 1),
+(4187, 117, 'Skrundas novads', '093', 1),
+(4189, 117, 'Smiltenes novads', '094', 1),
+(4192, 117, 'Stopiņu novads', '095', 1),
+(4194, 117, 'Strenču novads', '096', 1),
+(4197, 117, 'Talsu novads', '097', 1),
+(4198, 117, 'Tērvetes novads', '098', 1),
+(4199, 117, 'Tukuma novads', '099', 1),
+(4201, 117, 'Vaiņodes novads', '100', 1),
+(4204, 117, 'Valkas novads', '101', 1),
+(4205, 117, 'Valmiera', 'VMR', 1),
+(4208, 117, 'Varakļānu novads', '102', 1),
+(4209, 117, 'Vārkavas novads', '103', 1),
+(4210, 117, 'Vecpiebalgas novads', '104', 1),
+(4211, 117, 'Vecumnieku novads', '105', 1),
+(4212, 117, 'Ventspils', 'VEN', 1),
+(4213, 117, 'Ventspils novads', '106', 1),
+(4215, 117, 'Viesītes novads', '107', 1),
+(4217, 117, 'Viļakas novads', '108', 1),
+(4219, 117, 'Viļānu novads', '109', 1),
+(4221, 117, 'Zilupes novads', '110', 1),
(4222, 43, 'Arica y Parinacota', 'AP', 1),
(4223, 43, 'Los Rios', 'LR', 1),
(4224, 220, 'Kharkivs''ka Oblast''', '63', 1),
@@ -6379,7 +6197,111 @@ INSERT INTO `oc_zone` (`zone_id`, `country_id`, `name`, `code`, `status`) VALUES
(4235, 100, 'Kepulauan Riau', 'KR', 1),
(4236, 105, 'Barletta-Andria-Trani', 'BT', 1),
(4237, 105, 'Fermo', 'FM', 1),
-(4238, 105, 'Monza Brianza', 'MB', 1);
+(4238, 105, 'Monza Brianza', 'MB', 1)
+(4239, 113, 'Seoul-teukbyeolsi', '11', 1),
+(4240, 113, 'Busan-gwangyeoksi', '26', 1),
+(4241, 113, 'Daegu-gwangyeoksi', '27', 1),
+(4242, 113, 'Daejeon-gwangyeoksi', '30', 1),
+(4243, 113, 'Gwangju-gwangyeoksi', '29', 1),
+(4244, 113, 'Incheon-gwangyeoksi', '28', 1),
+(4245, 113, 'Ulsan-gwangyeoksi', '31', 1),
+(4246, 113, 'Chungcheongbuk-do', '43', 1),
+(4247, 113, 'Chungcheongnam-do', '44', 1),
+(4248, 113, 'Gangwon-do', '42', 1),
+(4249, 113, 'Gyeonggi-do', '41', 1),
+(4250, 113, 'Gyeongsangbuk-do', '47', 1),
+(4251, 113, 'Gyeongsangnam-do', '48', 1),
+(4252, 113, 'Jeollabuk-do', '45', 1),
+(4253, 113, 'Jeollanam-do', '46', 1),
+(4254, 113, 'Jeju-teukbyeoljachido', '49', 1),
+(4255, 113, 'Sejong-teukbyeoljachisi', '50', 1),
+(4256, 209, 'Phra Nakhon Si Ayutthaya', '14', 1)
+(4257, 176, 'Adygeja, Respublika', 'AD', 1),
+(4258, 176, 'Altaj, Respublika', 'AL', 1),
+(4259, 176, 'Baškortostan, Respublika', 'BA', 1),
+(4260, 176, 'Burjatija, Respublika', 'BU', 1),
+(4261, 176, 'Čečenskaja Respublika', 'CE', 1),
+(4262, 176, 'Čuvašskaja Respublika', 'CU', 1),
+(4263, 176, 'Dagestan, Respublika', 'DA', 1),
+(4264, 176, 'Ingušetija, Respublika', 'IN', 1),
+(4265, 176, 'Kabardino-Balkarskaja Respublika', 'KB', 1),
+(4266, 176, 'Kalmykija, Respublika', 'KL', 1),
+(4267, 176, 'Karačaevo-Čerkesskaja Respublika', 'KC', 1),
+(4268, 176, 'Karelija, Respublika', 'KR', 1),
+(4269, 176, 'Hakasija, Respublika', 'KK', 1),
+(4270, 176, 'Komi, Respublika', 'KO', 1),
+(4271, 176, 'Marij Èl, Respublika', 'ME', 1),
+(4272, 176, 'Mordovija, Respublika', 'MO', 1),
+(4273, 176, 'Sakha, Respublika (Yakutiya)', 'SA', 1),
+(4274, 176, 'Severnaja Osetija, Respublika (Alanija)', 'SE', 1),
+(4275, 176, 'Tatarstan, Respublika', 'TA', 1),
+(4276, 176, 'Tyva, Respublika (Tuva)', 'TY', 1),
+(4277, 176, 'Udmurtskaja Respublika', 'UD', 1),
+(4278, 176, 'Altajskij kraj', 'ALT', 1),
+(4279, 176, 'Kamčatskij kraj', 'KAM', 1),
+(4280, 176, 'Habarovskij kraj', 'KHA', 1),
+(4281, 176, 'Krasnodarskij kraj', 'KDA', 1),
+(4282, 176, 'Krasnojarskij kraj', 'KYA', 1),
+(4283, 176, 'Permskij kraj', 'PER', 1),
+(4284, 176, 'Primorskij kraj', 'PRI', 1),
+(4285, 176, 'Stavropol''skij kraj', 'STA', 1),
+(4286, 176, 'Zabajkal''skij kraj', 'ZAB', 1),
+(4287, 176, 'Amurskaja oblast', 'AMU', 1),
+(4288, 176, 'Arhangel''skaja oblast', 'ARK', 1),
+(4289, 176, 'Astrahanskaja oblast', 'AST', 1),
+(4290, 176, 'Belgorodskaja oblast', 'BEL', 1),
+(4291, 176, 'Brjanskaja oblast', 'BRY', 1),
+(4292, 176, 'Čeljabinskaja oblast', 'CHE', 1),
+(4293, 176, 'Irkutskaja oblast', 'IRK', 1),
+(4294, 176, 'Ivanovskaja oblast', 'IVA', 1),
+(4295, 176, 'Kaliningradskaja oblast', 'KGD', 1),
+(4296, 176, 'Kalužskaja oblast', 'KLU', 1),
+(4297, 176, 'Kemerovskaja oblast', 'KEM', 1),
+(4298, 176, 'Kirovskaja oblast', 'KIR', 1),
+(4299, 176, 'Kostromskaja oblast', 'KOS', 1),
+(4300, 176, 'Kurganskaja oblast', 'KGN', 1),
+(4301, 176, 'Kurskaja oblast', 'KRS', 1),
+(4302, 176, 'Leningradskaja oblast', 'LEN', 1),
+(4303, 176, 'Lipeckaja oblast', 'LIP', 1),
+(4304, 176, 'Magadanskaja oblast', 'MAG', 1),
+(4305, 176, 'Moskovskaja oblast', 'MOS', 1),
+(4306, 176, 'Murmanskaja oblast', 'MUR', 1),
+(4307, 176, 'Nižegorodskaja oblast', 'NIZ', 1),
+(4308, 176, 'Novgorodskaja oblast', 'NGR', 1),
+(4309, 176, 'Novosibirskaja oblast', 'NVS', 1),
+(4310, 176, 'Omskaja oblast', 'OMS', 1),
+(4311, 176, 'Orenburgskaja oblast', 'ORE', 1),
+(4312, 176, 'Orlovskaja oblast', 'ORL', 1),
+(4313, 176, 'Penzenskaja oblast', 'PNZ', 1),
+(4314, 176, 'Pskovskaja oblast', 'PSK', 1),
+(4315, 176, 'Rostovskaja oblast', 'ROS', 1),
+(4316, 176, 'Rjazanskaja oblast', 'RYA', 1),
+(4317, 176, 'Sahalinskaja oblast', 'SAK', 1),
+(4318, 176, 'Samarskaja oblast', 'SAM', 1),
+(4319, 176, 'Saratovskaja oblast', 'SAR', 1),
+(4320, 176, 'Smolenskaja oblast', 'SMO', 1),
+(4321, 176, 'Sverdlovskaja oblast', 'SVE', 1),
+(4322, 176, 'Tambovskaja oblast', 'TAM', 1),
+(4323, 176, 'Tomskaja oblast', 'TOM', 1),
+(4324, 176, 'Tul''skaja oblast', 'TUL', 1),
+(4325, 176, 'Tverskaja oblast', 'TVE', 1),
+(4326, 176, 'Tjumenskaja oblast', 'TYU', 1),
+(4327, 176, 'Ul''janovskaja oblast', 'ULY', 1),
+(4328, 176, 'Vladimirskaja oblast', 'VLA', 1),
+(4329, 176, 'Volgogradskaja oblast', 'VGG', 1),
+(4330, 176, 'Vologodskaja oblast', 'VLG', 1),
+(4331, 176, 'Voronežskaja oblast', 'VOR', 1),
+(4332, 176, 'Jaroslavskaja oblast', 'YAR', 1),
+(4333, 176, 'Sankt-Peterburg', 'SPE', 1),
+(4334, 176, 'Evrejskaja avtonomnaja oblast', 'YEV', 1),
+(4335, 176, 'Čukotskij avtonomnyj okrug', 'CHU', 1),
+(4336, 176, 'Hanty-Mansijskij avtonomnyj okrug (Jugra)', 'KHM', 1),
+(4337, 176, 'Neneckij avtonomnyj okrug', 'NEN', 1),
+(4338, 176, 'Jamalo-Neneckij avtonomnyj okrug', 'YAN', 1),
+(4339, 117, 'Aglonas novads', '001', 1)
+(4340, 99, 'Chhattisgarh', 'CT', 1),
+(4341, 99, 'Ladakh', 'LA', 1),
+(4342, 99, 'Uttarakhand', 'UT', 1);
-----------------------------------------------------------
| 0
|
ca9b8e8797dbb7109a052bd3d7316ef27081531c
|
https://github.com/FransUrbo/zfs/commit/ca9b8e8797dbb7109a052bd3d7316ef27081531c
|
Update codecov.io behavior
Update the codecov.yml included in the repository to behave as
originally intended. This can be refined as needed.
* Always post coverage results to the GitHub PR after two builds
have been uploaded. This is the normal case since there will
be a build uploaded for both kernel and user coverage results.
* Adjust red -> yellow -> green coloring in the web interface.
Due to the number of unlikely error conditions which are hard
to force consider 90% coverage an excellent level of coverage.
* Allow a 1% variance in coverage between test runs. This is
approximately 10x larger than the typical variance observed
which leaves us a reasonable margin to prevent false positives.
* Always post a new smaller comment to PRs which does not include
a file list. Old coverage reports are removed.
Reviewed by: Prakash Surya <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6765
|
diff --git a/.github/codecov.yml b/.github/codecov.yml
index e74c59a0fc9..ab0f11d7966 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,30 +1,21 @@
codecov:
notify:
- require_ci_to_pass: no
+ require_ci_to_pass: false # always post
+ after_n_builds: 2 # user and kernel
coverage:
- precision: 2
- round: down
- range: "50...100"
+ precision: 2 # 2 digits of precision
+ range: "50...90" # red -> yellow -> green
status:
project:
default:
- threshold: 1%
+ threshold: 1% # allow 1% coverage variance
patch:
default:
- threshold: 1%
-
-parsers:
- gcov:
- branch_detection:
- conditional: yes
- loop: yes
- method: no
- macro: no
+ threshold: 1% # allow 1% coverage variance
comment:
- layout: "header, sunburst, diff"
- behavior: default
- require_changes: no
+ layout: "reach, diff, flags, footer"
+ behavior: "new" # delete old, post new
| 0
|
d7e759d4f2434af57065db3461d4637c3e2ea132
|
https://github.com/Chevereto/Chevereto-Free/commit/d7e759d4f2434af57065db3461d4637c3e2ea132
|
made conditional universal
|
diff --git a/app/web.php b/app/web.php
index 469d54e..952967f 100644
--- a/app/web.php
+++ b/app/web.php
@@ -461,8 +461,15 @@
}
unset($v);
$handler::setVar('explore_semantics', $explore_semantics);
+
// Get active AND visible pages
- $pages_visible_db = Page::getAll(['is_active' => 1, 'is_link_visible' => 1], ['field' => 'sort_display', 'order' => 'ASC']);
+ $versionCompare = '3.6.7';
+ if (defined('G_APP_GITHUB_REPO')) {
+ $versionCompare = '1.0.0';
+ }
+ if (version_compare(Settings::get('chevereto_version_installed'), $versionCompare, '>=')) {
+ $pages_visible_db = Page::getAll(['is_active' => 1, 'is_link_visible' => 1], ['field' => 'sort_display', 'order' => 'ASC']);
+ }
$versionCompare = '3.12.4';
if (defined('G_APP_GITHUB_REPO')) {
$versionCompare = '1.2.0';
| 0
|
0ec2b89505a0e3bcf9b0558c3766120899fab658
|
https://github.com/vadz/libtiff/commit/0ec2b89505a0e3bcf9b0558c3766120899fab658
|
avoid spurious jpeg table updates
|
diff --git a/ChangeLog b/ChangeLog
index fe756341..167fa461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-21 Frank Warmerdam <[email protected]>
+
+ * libtiff/tif_jpeg.c: avoid preparing jpeg tables everytime
+ JPEGSetupEncode() is called if the tables already seem to be
+ established. This prevents spurious updates and rewriting of
+ directories with jpegtables when doing updates to existing images.
+ http://trac.osgeo.org/gdal/ticket/3539
+
2010-04-20 Olivier Paquet <[email protected]>
* libtiff/tif_dirinfo.c: Use correct set_field_type for
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 0f2e95f6..7471ec3e 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1612,12 +1612,16 @@ JPEGSetupEncode(TIFF* tif)
/* Create a JPEGTables field if appropriate */
if (sp->jpegtablesmode & (JPEGTABLESMODE_QUANT|JPEGTABLESMODE_HUFF)) {
- if (!prepare_JPEGTables(tif))
- return (0);
- /* Mark the field present */
- /* Can't use TIFFSetField since BEENWRITING is already set! */
- TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
- tif->tif_flags |= TIFF_DIRTYDIRECT;
+ if( sp->jpegtables == NULL
+ || memcpy(sp->jpegtables,"\0\0\0\0\0\0\0\0\0",8) == 0 )
+ {
+ if (!prepare_JPEGTables(tif))
+ return (0);
+ /* Mark the field present */
+ /* Can't use TIFFSetField since BEENWRITING is already set! */
+ tif->tif_flags |= TIFF_DIRTYDIRECT;
+ TIFFSetFieldBit(tif, FIELD_JPEGTABLES);
+ }
} else {
/* We do not support application-supplied JPEGTables, */
/* so mark the field not present */
| 0
|
ffa87887ee0517793df7541629a470e331f9fe60
|
https://github.com/rdoc/rdoc/commit/ffa87887ee0517793df7541629a470e331f9fe60
|
Fix CVE-2013-0256, an XSS exploit in RDoc
See CVE-2013-0256 for details on the exploit including a patch you can
apply to generated RDoc output.
|
diff --git a/CVE-2013-0256.rdoc b/CVE-2013-0256.rdoc
new file mode 100644
index 0000000000..b285b6ac45
--- /dev/null
+++ b/CVE-2013-0256.rdoc
@@ -0,0 +1,49 @@
+= RDoc 2.3.0 through 3.12 XSS Exploit
+
+RDoc documentation generated by rdoc 2.3.0 through rdoc 3.12 and prereleases up
+to rdoc 4.0.0.preview2.1 are vulnerable to an XSS exploit. This exploit may
+lead to cookie disclosure to third parties.
+
+The exploit exists in darkfish.js which is copied from the RDoc install
+location to the generated documentation.
+
+RDoc is a static documentation generation tool. Patching the library itself
+is insufficient to correct this exploit. Those hosting rdoc documentation will
+need to apply the following patch. If applied while ignoring whitespace, this
+patch will correct all affected versions:
+
+ diff --git darkfish.js darkfish.js
+ index 4be722f..f26fd45 100644
+ --- darkfish.js
+ +++ darkfish.js
+ @@ -109,13 +109,15 @@ function hookSearch() {
+ function highlightTarget( anchor ) {
+ console.debug( "Highlighting target '%s'.", anchor );
+
+ - $("a[name=" + anchor + "]").each( function() {
+ - if ( !$(this).parent().parent().hasClass('target-section') ) {
+ - console.debug( "Wrapping the target-section" );
+ - $('div.method-detail').unwrap( 'div.target-section' );
+ - $(this).parent().wrap( '<div class="target-section"></div>' );
+ - } else {
+ - console.debug( "Already wrapped." );
+ + $("a[name]").each( function() {
+ + if ( $(this).attr("name") == anchor ) {
+ + if ( !$(this).parent().parent().hasClass('target-section') ) {
+ + console.debug( "Wrapping the target-section" );
+ + $('div.method-detail').unwrap( 'div.target-section' );
+ + $(this).parent().wrap( '<div class="target-section"></div>' );
+ + } else {
+ + console.debug( "Already wrapped." );
+ + }
+ }
+ });
+ };
+
+RDoc 3.9.5, 3.12.1 and RDoc 4.0.0.rc.2 and newer are not vulnerable to this
+exploit.
+
+This exploit was discovered by Evgeny Ermakov <[email protected]>.
+
+This vulnerability has been assigned the CVE identifier CVE-2013-0256.
+
diff --git a/History.rdoc b/History.rdoc
index 21497df1dc..f4ebf1f5c1 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,4 +1,4 @@
-=== 4.0.0.preview3.1 / ??
+=== 4.0.0.rc.2 / ??
As a preview release, please file bugs for any problems you have with rdoc at
https://github.com/rdoc/rdoc/issues
@@ -14,6 +14,9 @@ to build HTML documentation when installing gems.)
* Added current heading and page-top links to HTML headings.
* Bug fixes
+ * Fixed an XSS exploit in darkfish.js. This could lead to cookie disclosure
+ to third parties. See CVE-2012-0256.rdoc for full details including a
+ patch you can apply to generated RDoc documentation.
* Fixed parsing of multibyte files with incomplete characters at byte 1024.
Ruby bug #6393 by nobu, patch by Nobuyoshi Nakada and Yui NARUSE.
* Fixed rdoc -E. Ruby Bug #6392 and (modified) patch by Nobuyoshi Nakada
diff --git a/Manifest.txt b/Manifest.txt
index 918447a924..b26bfef9b1 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,5 +1,6 @@
.autotest
.document
+CVE-2013-0256.rdoc
DEVELOPERS.rdoc
History.rdoc
LEGAL.rdoc
diff --git a/Rakefile b/Rakefile
index 3985102beb..962c473be8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,6 +48,7 @@ Depending on your version of ruby, you may need to install ruby rdoc/ri data:
self.testlib = :minitest
self.extra_rdoc_files += %w[
DEVELOPERS.rdoc
+ CVE-2013-0256.rdoc
History.rdoc
LICENSE.rdoc
LEGAL.rdoc
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index 2cac8be741..1b53421927 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -64,7 +64,7 @@ class Error < RuntimeError; end
##
# RDoc version you are using
- VERSION = '4.0.0.preview3.1'
+ VERSION = '4.0.0.rc.2'
##
# Method visibilities
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
index 4be722fac3..f26fd45d3a 100644
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -109,13 +109,15 @@ function hookSearch() {
function highlightTarget( anchor ) {
console.debug( "Highlighting target '%s'.", anchor );
- $("a[name=" + anchor + "]").each( function() {
- if ( !$(this).parent().parent().hasClass('target-section') ) {
- console.debug( "Wrapping the target-section" );
- $('div.method-detail').unwrap( 'div.target-section' );
- $(this).parent().wrap( '<div class="target-section"></div>' );
- } else {
- console.debug( "Already wrapped." );
+ $("a[name]").each( function() {
+ if ( $(this).attr("name") == anchor ) {
+ if ( !$(this).parent().parent().hasClass('target-section') ) {
+ console.debug( "Wrapping the target-section" );
+ $('div.method-detail').unwrap( 'div.target-section' );
+ $(this).parent().wrap( '<div class="target-section"></div>' );
+ } else {
+ console.debug( "Already wrapped." );
+ }
}
});
};
| 1
|
ba439aa710cafc2bfe63eeaaf4c6abad19dd6ece
|
https://github.com/linlinjava/litemall/commit/ba439aa710cafc2bfe63eeaaf4c6abad19dd6ece
|
Merge branch 'dev' of https://github.com/linlinjava/litemall into dev
|
diff --git a/litemall-wx/app.js b/litemall-wx/app.js
index 1fb78e95b..d9b0acc95 100644
--- a/litemall-wx/app.js
+++ b/litemall-wx/app.js
@@ -4,6 +4,17 @@ var user = require('./utils/user.js');
App({
onLaunch: function() {
+ Promise.prototype.finally = function(callback){
+ let P = this.constructor;
+ return this.then(
+ value => {
+ P.resolve(callback()).then(() => value)
+ },
+ reason => {
+ P.resolve(callback()).then(() => { throw reason })
+ }
+ )
+ }
const updateManager = wx.getUpdateManager();
wx.getUpdateManager().onUpdateReady(function() {
wx.showModal({
diff --git a/renard-wx/app.js b/renard-wx/app.js
index 1fb78e95b..2c55319f2 100644
--- a/renard-wx/app.js
+++ b/renard-wx/app.js
@@ -4,7 +4,20 @@ var user = require('./utils/user.js');
App({
onLaunch: function() {
+ Promise.prototype.finally = function(callback){
+ let P = this.constructor;
+ return this.then(
+ value => {
+ P.resolve(callback()).then(() => value)
+ },
+ reason => {
+ P.resolve(callback()).then(() => { throw reason })
+ }
+ )
+ }
+
const updateManager = wx.getUpdateManager();
+
wx.getUpdateManager().onUpdateReady(function() {
wx.showModal({
title: '更新提示',
| 0
|
4f15a3ace60a89fb4ce75191fbab1998967e59bd
|
https://github.com/hercules-team/augeas/commit/4f15a3ace60a89fb4ce75191fbab1998967e59bd
|
* examples/dump.c: stop building with _GNU_SOURCE
This might not be available on all the platforms, and it should not be
needed anyway.
|
diff --git a/examples/dump.c b/examples/dump.c
index b9d254b1..51a3c971 100644
--- a/examples/dump.c
+++ b/examples/dump.c
@@ -36,7 +36,6 @@
* dump '//descendant::*'
*
*/
-#define _GNU_SOURCE
#include <augeas.h>
| 0
|
8717f469b10e9f7e1547c6f70f7d24e1359d28d4
|
https://github.com/firefly-iii/firefly-iii/commit/8717f469b10e9f7e1547c6f70f7d24e1359d28d4
|
Fix #2370
|
diff --git a/app/Support/Http/Controllers/UserNavigation.php b/app/Support/Http/Controllers/UserNavigation.php
index 66e30c5c02e..1cac4ed6b0f 100644
--- a/app/Support/Http/Controllers/UserNavigation.php
+++ b/app/Support/Http/Controllers/UserNavigation.php
@@ -124,7 +124,7 @@ protected function redirectToOriginalAccount(Account $account)
/** @var Transaction $transaction */
$transaction = $account->transactions()->first();
if (null === $transaction) {
- app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => $account->name, 'id' => $account->id]));
+ app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => e($account->name), 'id' => $account->id]));
Log::error(sprintf('Expected a transaction. Account #%d has none. BEEP, error.', $account->id));
return redirect(route('index'));
@@ -135,7 +135,7 @@ protected function redirectToOriginalAccount(Account $account)
$opposingTransaction = $journal->transactions()->where('transactions.id', '!=', $transaction->id)->first();
if (null === $opposingTransaction) {
- app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => $account->name, 'id' => $account->id]));
+ app('session')->flash('error', trans('firefly.account_missing_transaction', ['name' => e($account->name), 'id' => $account->id]));
Log::error(sprintf('Expected an opposing transaction. Account #%d has none. BEEP, error.', $account->id));
}
| 1
|
076b6f998c42613dd64206c0a1d0d4a6e2055efb
|
https://github.com/cakephp/cakephp/commit/076b6f998c42613dd64206c0a1d0d4a6e2055efb
|
Don't display errors with paths.
Errors with paths are a security vulnerability as path disclosure can
be used with other small exploits to be more useful.
|
diff --git a/src/View/Cell.php b/src/View/Cell.php
index 1fe687482da..15e26a262a5 100644
--- a/src/View/Cell.php
+++ b/src/View/Cell.php
@@ -157,13 +157,17 @@ public function render($template = null) {
*
* Starts the rendering process when Cell is echoed.
*
+ * *Note* This method will trigger an error when view rendering has a problem.
+ * This is because PHP will not allow a __toString() method to throw an exception.
+ *
* @return string Rendered cell
*/
public function __toString() {
try {
return $this->render();
} catch (\Exception $e) {
- return "Error: Could not render cell - " . $e->getMessage();
+ trigger_error('Could not render cell - ' . $e->getMessage(), E_USER_WARNING);
+ return '';
}
}
diff --git a/src/View/View.php b/src/View/View.php
index f318bede5a7..2b3b7183ac6 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -377,7 +377,8 @@ public function __construct(Request $request = null, Response $response = null,
* Defaults to false.
* - `ignoreMissing` - Used to allow missing elements. Set to true to not throw exceptions.
* @return string Rendered Element
- * @throws
+ * @throws \Cake\View\Error\MissingElementException When an element is missing and `ignoreMissing`
+ * is false.
*/
public function element($name, array $data = array(), array $options = array()) {
$file = $plugin = null;
diff --git a/tests/TestCase/View/CellTest.php b/tests/TestCase/View/CellTest.php
index a1ed69abdae..e49f586ecc4 100644
--- a/tests/TestCase/View/CellTest.php
+++ b/tests/TestCase/View/CellTest.php
@@ -78,15 +78,24 @@ public function testCellRender() {
* @return void
*/
public function testCellImplictRenderWithError() {
+ $capture = function ($errno, $msg) {
+ restore_error_handler();
+ $this->assertEquals(E_USER_WARNING, $errno);
+ $this->assertContains('Could not render cell - View file', $msg);
+ };
+ set_error_handler($capture);
+
$cell = $this->View->cell('Articles::teaserList');
$cell->template = 'nope';
- $output = "{$cell}";
- $this->assertStringStartsWith("Error: Could not render cell - View file", $output);
+ $result = "{$cell}";
}
/**
* Tests that we are able pass multiple arguments to cell methods.
*
+ * This test sets its own error handler, as PHPUnit won't convert
+ * errors into exceptions when the caller is a __toString() method.
+ *
* @return void
*/
public function testCellWithArguments() {
| 1
|
12f66f69f7bf1ec1266ddbee90a7616cbf33696b
|
https://github.com/the-tcpdump-group/tcpdump/commit/12f66f69f7bf1ec1266ddbee90a7616cbf33696b
|
(for 4.9.3) CVE-2018-14470/Babel: fix an existing length check
In babel_print_v2() the non-verbose branch for an Update TLV compared
the TLV Length against 1 instead of 10 (probably a typo), put it right.
This fixes a buffer over-read discovered by Henri Salo from Nixu
Corporation.
Add a test using the capture file supplied by the reporter(s).
|
diff --git a/print-babel.c b/print-babel.c
index f8741d7bf..1a31f2a3c 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -480,7 +480,7 @@ babel_print_v2(netdissect_options *ndo,
case MESSAGE_UPDATE: {
if (!ndo->ndo_vflag) {
ND_PRINT((ndo, " update"));
- if(len < 1)
+ if(len < 10)
ND_PRINT((ndo, "/truncated"));
else
ND_PRINT((ndo, "%s%s%s",
diff --git a/tests/TESTLIST b/tests/TESTLIST
index 7c1b84e58..e841424c8 100644
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -583,6 +583,7 @@ icmp6_nodeinfo_oobr icmp6_nodeinfo_oobr.pcap icmp6_nodeinfo_oobr.out
# bad packets from Henri Salo
rx_ubik-oobr rx_ubik-oobr.pcap rx_ubik-oobr.out -c1
+babel_update_oobr babel_update_oobr.pcap babel_update_oobr.out -c 52
# RTP tests
# fuzzed pcap
diff --git a/tests/babel_update_oobr.out b/tests/babel_update_oobr.out
new file mode 100644
index 000000000..1d60fee09
--- /dev/null
+++ b/tests/babel_update_oobr.out
@@ -0,0 +1,66 @@
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^O^O^O^O^DM-2M-!M-1M-1M-1M-1M-1M-1M-1M-1M-,.M-0^Vn [|kerberos]
+IP 10.0.0.1 > 0.234.154.214: ip-proto-17
+IP 10.0.0.1.88 > 0.234.154.179.24191: v4 be KDC_REQUEST: ^O^O^O^O^O^DM-2 .*^C@>M-z}M-uM-tM-+M-_M-{S^PM-=OM-^Y [|kerberos]
+58:5e:0a:02:f4:0a > 02:8e:00:50:6a:e1, ethertype Unknown (0xb104), length 3892667167:
+ 0x0000: 020f 0f0f 0f0f 0f0f 0f0f 04b2 a1b1 b1b1 ................
+ 0x0010: b1b1 b1b1 b158 5e0a 02f4 0ab1 0402 0f0f .....X^.........
+ 0x0020: ff80 0f0f 0f0f 0f00 80a1 00b2 b2b2 b20d ................
+ 0x0030: 0d3a 3400 0001 00 .:4....
+IP 6.3.218.255.6379 > 0.1.31.99.639: Flags [S.UW], seq 2751463404:2751463426, ack 1006637056, win 45746, urg 25778, length 22: RESP [|RESP]
+IP 6.3.208.255.6379 > 0.1.31.99.639: Flags [S.UW], seq 2751463404:2751463426, ack 1006640128, win 45746, urg 25778, length 22: RESP "M-2M-2M-2M-2M-2M-7dM-2M-2M-2M-2M-2" [|RESP]
+IP 208.21.10.1.654 > 31.99.100.232.80: aodv rrep 34 prefix 4 hops 11
+ dst 237.34.38.84 dseq 32203525 src 232.11.2.0 67108864 ms
+ ext 0 0
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^O^O^O^O^DM-WM-WM-WM-WM-WM-WM-W.@ 680min [|kerberos]
+IP 10.0.253.1.88 > 0.234.154.214.24073: v4 be KDC_REQUEST: .M-^?M-^?^AM-^@M-^?M-^@M-V@M-WM-WM-sM-WM-WM-WM-WM-W 880min ^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?.d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24073: v4 be KDC_REQUEST: .M-^?M-^?^AM-^@M-^?M-^@M-V@M-WM-WM-sM-WM-WM-WM-WM-W 880min ^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?.d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-W^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.242.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O'^O^O@@.@^Qjp^J@ 1070min .X^^J^B [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^U.@^O^D^O^O^O^O^O^O^O^O^O^O^O^O [|kerberos]
+IP 10.0.222.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^DM-2 .M-g^C@>M-y}M-uM-tM-+M-` 680min [|kerberos]
+01:01:ed:83:e3:ff > 02:8e:00:50:6d:e1, ethertype Unknown (0x0700), length 3892672031:
+ 0x0000: 4508 8834 d940 4000 4011 4a70 0a00 0001 E..4.@@[email protected]....
+ 0x0010: 00ea 9ad6 0058 5e0a 02f4 0ab1 0402 0f0f .....X^.........
+ 0x0020: 0f0f 0f0f 0f0f 0f04 b2a1 b1b1 b1b1 b1b1 ................
+ 0x0030: b1b1 b100 b016 6e ......n
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^U.@ ^D^R^O^O^O^O^O^O^O^O^O^O^O [|kerberos]
+IP 10.0.255.127.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^DM-2 .M-g^C@>M-z}M-uM-tM-^\M-`^VM-^?^?M-=OM-^Y [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O.^B^O^O^O^O^DM-2M-!M-1M-1M-1M-1M-1M-1M-1M-1M-1M-^@M-0^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?M-^@^D^O^O^O^O^O^P.M-^?M-^?^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-#M-^?M-^?d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 0.0.1.0 > 234.154.214.0: ip-proto-106
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?M-^@^D^O^O^O^O^O^P.M-^?M-^?^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-^@M-^?M-^?M-^?^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O^O^O^O^O^DM-WM-WM-WM-WM-WM-WM-W.@ 680min [|kerberos]
+IP 10.0.253.1.8280 > 0.234.154.214.24073: UDP, bad length 60652 > 32792
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?.d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-W^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O'^O^O@@.@^Qjp^J@ 1070min .X^^J^B [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 le APPL_REQUEST_MUTUAL: (unknown)
+01:00:01:00:00:00 > 02:8e:00:50:6a:e1, ethertype Unknown (0x08e8), length 3892667167:
+ 0x0000: 4408 8034 d92b 4000 4011 3b70 0a00 0001 D..4.+@.@.;p....
+ 0x0010: 00ea 9ad6 0058 5e0a 02f4 0ab1 0402 ffff .....X^.........
+ 0x0020: ff7f 80ff 80d6 00c3 0880 34d9 4040 0040 ..........4.@@.@
+ 0x0030: 114a 700a 0016 88 .Jp....
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: .M-oM-^?M-^?@M-^?M-^@M-V M-WM-WM-WM-WM-WM-WM-WM-W 0min ^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.210.24073: v4 be KDC_REQUEST: .M-^?M-^?^AM-^@M-^?M-^@M-V@M-WM-WM-sM-WM-WM-WM-WM-W 880min ^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?.d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-WM-^?M-!^B^O^O^P@M-^?M-^?^O^O^O [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-#M-^?M-^?d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-W^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074:
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-^@M-^?M-^?M-^?^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074:
+IP 10.0.253.1.88 > 0.234.154.214.24073: v4 be KDC_REQUEST: .M-^?M-^?^AM-^@M-^?M-^@M-V@M-WM-WM-sM-WM-WM-WM-WM-W 880min ^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?.d^O^O^O^O^O^O^O^O^O^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-W^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O'^O^O@@.@^Qjp^J@ 1070min .X^^J^B [|kerberos]
+IP 64.0.0.1.88 > 0.234.154.214.24074: v4 le APPL_REQUEST_MUTUAL: (unknown)
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: M-^?M-^?M-^?^?M-^@M-^?M-^@M-V.M-C^HM-^@4M-Y@@@@^QJp^J [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: .M-oM-^?M-^?@M-^?M-^@M-V 75min ^O^O^O^O^O^O^O^O.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-2M-!^BM-W^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O^O7M-^@M-^?M-^@^D^O^O^O^O^O^P.M-^?M-^?^O^O^O@^VM-^H [|kerberos]
+IP 10.0.0.1.88 > 0.234.154.214.24074: v4 be KDC_REQUEST: ^O^O^O^O.^DM-^@M-^?M-^?M-^?^CM-!^B@^D 0min ^P.^VM-^H [|kerberos]
+IP 208.21.42.58.6697 > 110.228.104.254.30952: babel 2 (2056) update/truncated update/truncated update/truncated [|babel]
diff --git a/tests/babel_update_oobr.pcap b/tests/babel_update_oobr.pcap
new file mode 100644
index 000000000..2406c043e
Binary files /dev/null and b/tests/babel_update_oobr.pcap differ
| 1
|
924a016ffe7ae7ea6d516c07a7852f0095eddbce
|
https://github.com/umbraco/Umbraco-CMS/commit/924a016ffe7ae7ea6d516c07a7852f0095eddbce
|
Fixes U4-7457 Server side request forgery (xsrf) in feedproxy.aspx
|
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
index a938935d2b4a..b304cda0b6ac 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
@@ -27,7 +27,9 @@ protected void Page_Load(object sender, EventArgs e)
if (Uri.TryCreate(url, UriKind.Absolute, out requestUri))
{
var feedProxyXml = xmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
- if (feedProxyXml != null && feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
+ if (feedProxyXml != null
+ && feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null
+ && requestUri.Port == 80)
{
using (var client = new WebClient())
{
| 1
|
ee4aae7e743adc2d11d13abca9b839ac4a175624
|
https://github.com/Piwigo/Piwigo/commit/ee4aae7e743adc2d11d13abca9b839ac4a175624
|
Fixes #767 - Return a 500 HTTP status when a file upload error occurs. (#768)
* Return a 500 HTTP status when a file upload error occurs.
|
diff --git a/include/ws_functions/pwg.images.php b/include/ws_functions/pwg.images.php
index 1181f0516a..84946e1f14 100644
--- a/include/ws_functions/pwg.images.php
+++ b/include/ws_functions/pwg.images.php
@@ -740,7 +740,7 @@ function ws_images_setPrivacyLevel($params, $service)
* @option int rank
*/
function ws_images_setRank($params, $service)
-{
+{
if (count($params['image_id']) > 1)
{
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@@ -773,7 +773,7 @@ function ws_images_setRank($params, $service)
{
return new PwgError(WS_ERR_MISSING_PARAM, 'rank is missing');
}
-
+
// does the image really exist?
$query = '
SELECT COUNT(*)
@@ -1167,13 +1167,48 @@ function ws_images_add($params, $service)
*/
function ws_images_addSimple($params, $service)
{
- global $conf;
+ global $conf, $logger;
if (!isset($_FILES['image']))
{
return new PwgError(405, 'The image (file) is missing');
}
+ if (isset($_FILES['image']['error']) && $_FILES['image']['error'] != 0)
+ {
+ switch($_FILES['image']['error'])
+ {
+ case UPLOAD_ERR_INI_SIZE:
+ $message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
+ break;
+ case UPLOAD_ERR_FORM_SIZE:
+ $message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
+ break;
+ case UPLOAD_ERR_PARTIAL:
+ $message = 'The uploaded file was only partially uploaded.';
+ break;
+ case UPLOAD_ERR_NO_FILE:
+ $message = 'No file was uploaded.';
+ break;
+ case UPLOAD_ERR_NO_TMP_DIR:
+ $message = 'Missing a temporary folder.';
+ break;
+ case UPLOAD_ERR_CANT_WRITE:
+ $message = 'Failed to write file to disk.';
+ break;
+ case UPLOAD_ERR_EXTENSION:
+ $message = 'A PHP extension stopped the file upload. ' .
+ 'PHP does not provide a way to ascertain which extension caused the file ' .
+ 'upload to stop; examining the list of loaded extensions with phpinfo() may help.';
+ break;
+ default:
+ $message = "Error number {$_FILES['image']['error']} occurred while uploading a file.";
+ }
+
+ $logger->error(__FUNCTION__ . " " . $message);
+ return new PwgError(500, $message);
+ }
+
if ($params['image_id'] > 0)
{
$query='
| 0
|
69fc0e1b5e6a3227576d67587c386142ef65854e
|
https://github.com/josh/rails/commit/69fc0e1b5e6a3227576d67587c386142ef65854e
|
Auth token mask from breach-mitigation-rails gem
This merges in the code from the breach-mitigation-rails gem that masks
authenticity tokens on each request by XORing them with a random set of
bytes. The masking is used to make it impossible for an attacker to
steal a CSRF token from an SSL session by using techniques like the
BREACH attack.
The patch is pretty simple - I've copied over the [relevant
code](https://github.com/meldium/breach-mitigation-rails/blob/master/lib/breach_mitigation/masking_secrets.rb)
and updated the tests to pass, mostly by adjusting stubs and mocks.
|
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 0efa0fb259599..15d030a0e583f 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -240,6 +240,8 @@ def non_xhr_javascript_response?
content_type =~ %r(\Atext/javascript) && !request.xhr?
end
+ AUTHENTICITY_TOKEN_LENGTH = 32
+
# Returns true or false if a request is verified. Checks:
#
# * is it a GET or HEAD request? Gets should be safe and idempotent
@@ -247,13 +249,73 @@ def non_xhr_javascript_response?
# * Does the X-CSRF-Token header match the form_authenticity_token
def verified_request?
!protect_against_forgery? || request.get? || request.head? ||
- form_authenticity_token == form_authenticity_param ||
- form_authenticity_token == request.headers['X-CSRF-Token']
+ valid_authenticity_token?(session, form_authenticity_param) ||
+ valid_authenticity_token?(session, request.headers['X-CSRF-Token'])
end
# Sets the token value for the current session.
def form_authenticity_token
- session[:_csrf_token] ||= SecureRandom.base64(32)
+ masked_authenticity_token(session)
+ end
+
+ # Creates a masked version of the authenticity token that varies
+ # on each request. The masking is used to mitigate SSL attacks
+ # like BREACH.
+ def masked_authenticity_token(session)
+ one_time_pad = SecureRandom.random_bytes(AUTHENTICITY_TOKEN_LENGTH)
+ encrypted_csrf_token = xor_byte_strings(one_time_pad, real_csrf_token(session))
+ masked_token = one_time_pad + encrypted_csrf_token
+ Base64.strict_encode64(masked_token)
+ end
+
+ # Checks the client's masked token to see if it matches the
+ # session token. Essentially the inverse of
+ # +masked_authenticity_token+.
+ def valid_authenticity_token?(session, encoded_masked_token)
+ return false if encoded_masked_token.nil? || encoded_masked_token.empty?
+
+ begin
+ masked_token = Base64.strict_decode64(encoded_masked_token)
+ rescue ArgumentError # encoded_masked_token is invalid Base64
+ return false
+ end
+
+ # See if it's actually a masked token or not. In order to
+ # deploy this code, we should be able to handle any unmasked
+ # tokens that we've issued without error.
+
+ if masked_token.length == AUTHENTICITY_TOKEN_LENGTH
+ # This is actually an unmasked token. This is expected if
+ # you have just upgraded to masked tokens, but should stop
+ # happening shortly after installing this gem
+ compare_with_real_token masked_token, session
+
+ elsif masked_token.length == AUTHENTICITY_TOKEN_LENGTH * 2
+ # Split the token into the one-time pad and the encrypted
+ # value and decrypt it
+ one_time_pad = masked_token[0...AUTHENTICITY_TOKEN_LENGTH]
+ encrypted_csrf_token = masked_token[AUTHENTICITY_TOKEN_LENGTH..-1]
+ csrf_token = xor_byte_strings(one_time_pad, encrypted_csrf_token)
+
+ compare_with_real_token csrf_token, session
+
+ else
+ false # Token is malformed
+ end
+ end
+
+ def compare_with_real_token(token, session)
+ # Borrow a constant-time comparison from Rack
+ Rack::Utils.secure_compare(token, real_csrf_token(session))
+ end
+
+ def real_csrf_token(session)
+ session[:_csrf_token] ||= SecureRandom.base64(AUTHENTICITY_TOKEN_LENGTH)
+ Base64.strict_decode64(session[:_csrf_token])
+ end
+
+ def xor_byte_strings(s1, s2)
+ s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*')
end
# The form's authenticity parameter. Override to provide your own.
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 2a5aad9c0ebc4..5e2510fb2e9f1 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -125,8 +125,9 @@ def form_authenticity_param
module RequestForgeryProtectionTests
def setup
@token = "cf50faa3fe97702ca1ae"
-
- SecureRandom.stubs(:base64).returns(@token)
+ @controller.stubs(:form_authenticity_token).returns(@token)
+ @controller.stubs(:valid_authenticity_token?).with{ |_, t| t == @token }.returns(true)
+ @controller.stubs(:valid_authenticity_token?).with{ |_, t| t != @token }.returns(false)
@old_request_forgery_protection_token = ActionController::Base.request_forgery_protection_token
ActionController::Base.request_forgery_protection_token = :custom_authenticity_token
end
@@ -386,7 +387,7 @@ class RequestForgeryProtectionControllerUsingResetSessionTest < ActionController
end
test 'should emit a csrf-param meta tag and a csrf-token meta tag' do
- SecureRandom.stubs(:base64).returns(@token + '<=?')
+ @controller.stubs(:form_authenticity_token).returns(@token + '<=?')
get :meta
assert_select 'meta[name=?][content=?]', 'csrf-param', 'custom_authenticity_token'
assert_select 'meta[name=?][content=?]', 'csrf-token', 'cf50faa3fe97702ca1ae<=?'
@@ -466,7 +467,7 @@ def setup
super
@old_logger = ActionController::Base.logger
@logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
- @token = "foobar"
+ @token = Base64.strict_encode64(SecureRandom.random_bytes(32))
@old_request_forgery_protection_token = ActionController::Base.request_forgery_protection_token
ActionController::Base.request_forgery_protection_token = @token
end
@@ -478,7 +479,7 @@ def teardown
def test_should_not_warn_if_form_authenticity_param_matches_form_authenticity_token
ActionController::Base.logger = @logger
- SecureRandom.stubs(:base64).returns(@token)
+ @controller.stubs(:valid_authenticity_token?).returns(:true)
begin
post :index, :custom_token_name => 'foobar'
| 1
|
6fdc8e328a7da02e65f8a3f752edba321ee2842e
|
https://github.com/sleuthkit/sleuthkit/commit/6fdc8e328a7da02e65f8a3f752edba321ee2842e
|
Adding unit tests, junit lib set to 4.12
|
diff --git a/bindings/java/nbproject/project.xml b/bindings/java/nbproject/project.xml
index 57a2b6befa..2b34d8ff45 100755
--- a/bindings/java/nbproject/project.xml
+++ b/bindings/java/nbproject/project.xml
@@ -114,14 +114,14 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/4">
<compilation-unit>
<package-root>src</package-root>
- <classpath mode="compile">lib;lib/diffutils-1.2.1.jar;lib/junit-4.8.2.jar;lib/postgresql-42.2.18.jar;lib/c3p0-0.9.5.jar;lib/mchange-commons-java-0.2.9.jar;lib/c3p0-0.9.5-sources.jar;lib/c3p0-0.9.5-javadoc.jar;lib/joda-time-2.4.jar;lib/commons-lang3-3.0.jar;lib/guava-19.0.jar;lib/SparseBitSet-1.1.jar;lib/gson-2.8.5.jar;lib/commons-validator-1.6.jar</classpath>
+ <classpath mode="compile">lib;lib/diffutils-1.2.1.jar;lib/junit-4.12.jar;lib/postgresql-42.2.18.jar;lib/c3p0-0.9.5.jar;lib/mchange-commons-java-0.2.9.jar;lib/c3p0-0.9.5-sources.jar;lib/c3p0-0.9.5-javadoc.jar;lib/joda-time-2.4.jar;lib/commons-lang3-3.0.jar;lib/guava-19.0.jar;lib/SparseBitSet-1.1.jar;lib/gson-2.8.5.jar;lib/commons-validator-1.6.jar</classpath>
<built-to>build</built-to>
<source-level>1.8</source-level>
</compilation-unit>
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
- <classpath mode="compile">build;lib/diffutils-1.2.1.jar;lib/diffutils-1.2.1-javadoc.jar;lib/diffutils-1.2.1-sources.jar;lib/junit-4.8.2.jar</classpath>
+ <classpath mode="compile">build;lib/diffutils-1.2.1.jar;lib/diffutils-1.2.1-javadoc.jar;lib/diffutils-1.2.1-sources.jar;lib/junit-4.12.jar</classpath>
<built-to>build</built-to>
<built-to>test</built-to>
<source-level>1.8</source-level>
diff --git a/bindings/java/test/org/sleuthkit/datamodel/AttributeTest.java b/bindings/java/test/org/sleuthkit/datamodel/AttributeTest.java
new file mode 100644
index 0000000000..ea8ae30e31
--- /dev/null
+++ b/bindings/java/test/org/sleuthkit/datamodel/AttributeTest.java
@@ -0,0 +1,148 @@
+/*
+ * Sleuth Kit Data Model
+ *
+ * Copyright 2021 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.datamodel;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * Tests TSK Attribute apis.
+ * Under test are the following
+ * - File Attribute
+ *
+ */
+public class AttributeTest {
+
+ private static final Logger LOGGER = Logger.getLogger(AttributeTest.class.getName());
+
+ private static SleuthkitCase caseDB;
+
+ private final static String TEST_DB = "AttributeApiTest.db";
+
+
+ private static String dbPath = null;
+ private static FileSystem fs = null;
+
+ public AttributeTest (){
+
+ }
+
+ @BeforeClass
+ public static void setUpClass() {
+ String tempDirPath = System.getProperty("java.io.tmpdir");
+ try {
+ dbPath = Paths.get(tempDirPath, TEST_DB).toString();
+
+ // Delete the DB file, in case
+ java.io.File dbFile = new java.io.File(dbPath);
+ dbFile.delete();
+ if (dbFile.getParentFile() != null) {
+ dbFile.getParentFile().mkdirs();
+ }
+
+ // Create new case db
+ caseDB = SleuthkitCase.newCase(dbPath);
+
+ SleuthkitCase.CaseDbTransaction trans = caseDB.beginTransaction();
+
+ Image img = caseDB.addImage(TskData.TSK_IMG_TYPE_ENUM.TSK_IMG_TYPE_DETECT, 512, 1024, "", Collections.emptyList(), "America/NewYork", null, null, null, "first", trans);
+
+ fs = caseDB.addFileSystem(img.getId(), 0, TskData.TSK_FS_TYPE_ENUM.TSK_FS_TYPE_RAW, 0, 0, 0, 0, 0, "", trans);
+
+ trans.commit();
+
+
+ System.out.println("Attributes Test DB created at: " + dbPath);
+ } catch (TskCoreException ex) {
+ LOGGER.log(Level.SEVERE, "Failed to create new case", ex);
+ }
+ }
+
+
+ @AfterClass
+ public static void tearDownClass() {
+
+ }
+
+ @Before
+ public void setUp() {
+ }
+
+ @After
+ public void tearDown() {
+ }
+
+ @Test
+ public void fileAttributeTests() throws TskCoreException {
+
+ String testMD5 = "c67017ead6356b987b30536d35e8f562";
+ List<Attribute> fileAttributes = new ArrayList<>();
+ fileAttributes.add(new Attribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED), 1611233915l));
+
+ List<Attribute> fileAttributes2 = new ArrayList<>();
+ fileAttributes2.add(new Attribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SSID), "S-1-15-3443-2233"));
+
+
+ SleuthkitCase.CaseDbTransaction trans = caseDB.beginTransaction();
+
+
+ FsContent root = caseDB.addFileSystemFile(fs.getDataSource().getId(), fs.getId(), "", 0, 0,
+ TskData.TSK_FS_ATTR_TYPE_ENUM.TSK_FS_ATTR_TYPE_DEFAULT, 0, TskData.TSK_FS_NAME_FLAG_ENUM.ALLOC,
+ (short) 0, 200, 0, 0, 0, 0, null, null, null, false, fs, Collections.emptyList(), trans);
+
+
+ FsContent windows = caseDB.addFileSystemFile(fs.getDataSource().getId(), fs.getId(), "Windows", 0, 0,
+ TskData.TSK_FS_ATTR_TYPE_ENUM.TSK_FS_ATTR_TYPE_DEFAULT, 0, TskData.TSK_FS_NAME_FLAG_ENUM.ALLOC,
+ (short) 0, 200, 0, 0, 0, 0, null, null, null, false, root, Collections.emptyList(), trans);
+
+ FsContent dllhosts = caseDB.addFileSystemFile(fs.getDataSource().getId(), fs.getId(), "dllhosts.exe", 0, 0,
+ TskData.TSK_FS_ATTR_TYPE_ENUM.TSK_FS_ATTR_TYPE_DEFAULT, 0, TskData.TSK_FS_NAME_FLAG_ENUM.ALLOC,
+ (short)0, 200, 0, 0, 0, 0, testMD5, null, "Applicatione/Exe" , true, windows, fileAttributes, trans);
+
+ FsContent _nofile = caseDB.addFileSystemFile(fs.getDataSource().getId(), fs.getId(), "nofile.exe", 0, 0,
+ TskData.TSK_FS_ATTR_TYPE_ENUM.TSK_FS_ATTR_TYPE_DEFAULT, 0, TskData.TSK_FS_NAME_FLAG_ENUM.ALLOC,
+ (short)0, 200, 0, 0, 0, 0, null, null, "Applicatione/Exe" , true, windows, Collections.emptyList(), trans);
+
+ dllhosts.addAttributes(fileAttributes2, trans);
+ trans.commit();
+
+ assertEquals(2, dllhosts.getAttributes().size());
+
+ List<AbstractFile> matchingFiles = caseDB.findFilesByMd5(testMD5);
+ assertEquals(1, matchingFiles.size());
+ assertEquals(2, matchingFiles.get(0).getAttributes().size());
+
+ List<AbstractFile> nofile = caseDB.findFiles(fs.getDataSource(), "nofile.exe");
+ assertEquals(1, nofile.size());
+ assertEquals(0, nofile.get(0).getAttributes().size());
+
+
+ }
+}
diff --git a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
index 2ec2da48f6..8a8826e7df 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
@@ -45,6 +45,7 @@
@Suite.SuiteClasses({
CommunicationsManagerTest.class,
CaseDbSchemaVersionNumberTest.class,
+ AttributeTest.class,
// Note: these tests have dependencies on images being placed in the input folder: nps-2009-canon2-gen6, ntfs1-gen, and small2
// org.sleuthkit.datamodel.TopDownTraversal.class,
| 0
|
d4102512147eca2af21c3b6ed63a67d852f4e66
|
https://github.com/apache/camel/commit/d4102512147eca2af21c3b6ed63a67d852f4e66
|
CAMEL-10567: Camel-Jackson: Add an option to allow the UnmarshallType header use
|
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index 06dab040a105..78baa7a6bdb6 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -68,7 +68,7 @@
private String enableFeatures;
private String disableFeatures;
private boolean enableJacksonTypeConverter;
- private boolean allowJacksonUnmarshallType;
+ private boolean allowUnmarshallType;
/**
* Use the default Jackson {@link ObjectMapper} and {@link Map}
@@ -160,7 +160,7 @@ public Object unmarshal(Exchange exchange, InputStream stream) throws Exception
// is there a header with the unmarshal type?
Class<?> clazz = unmarshalType;
String type = null;
- if (allowJacksonUnmarshallType) {
+ if (allowUnmarshallType) {
type = exchange.getIn().getHeader(JacksonConstants.UNMARSHAL_TYPE, String.class);
}
if (type == null && isAllowJmsType()) {
@@ -331,8 +331,8 @@ public void setEnableJacksonTypeConverter(boolean enableJacksonTypeConverter) {
this.enableJacksonTypeConverter = enableJacksonTypeConverter;
}
- public boolean isAllowJacksonUnmarshallType() {
- return allowJacksonUnmarshallType;
+ public boolean isAllowUnmarshallType() {
+ return allowUnmarshallType;
}
/**
@@ -340,8 +340,8 @@ public boolean isAllowJacksonUnmarshallType() {
* <p/>
* This should only be enabled when desired to be used.
*/
- public void setAllowJacksonUnmarshallType(boolean allowJacksonUnmarshallType) {
- this.allowJacksonUnmarshallType = allowJacksonUnmarshallType;
+ public void setAllowUnmarshallType(boolean allowJacksonUnmarshallType) {
+ this.allowUnmarshallType = allowJacksonUnmarshallType;
}
public String getEnableFeatures() {
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
index 623b32e1ce8a..775e7ea73c47 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalUnmarshalTypeHeaderTest.java
@@ -46,7 +46,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
@Override
public void configure() throws Exception {
JacksonDataFormat format = new JacksonDataFormat();
- format.setAllowJacksonUnmarshallType(true);
+ format.setAllowUnmarshallType(true);
from("direct:backPojo").unmarshal(format).to("mock:reversePojo");
| 1
|
ea604f84e4a21fe081d66bbdab454b1e8a7d09b3
|
https://github.com/apache/ofbiz/commit/ea604f84e4a21fe081d66bbdab454b1e8a7d09b3
|
Merged from trunk r1309993: CVE-2012-1621: Prevent user submitted data from being streamed directly back to the browser when the content map-key is not found. Log a warning instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release10.04@1310013 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/applications/content/src/org/ofbiz/content/content/ContentWorker.java b/applications/content/src/org/ofbiz/content/content/ContentWorker.java
index b0a4a7ccc4..f0b52247f1 100644
--- a/applications/content/src/org/ofbiz/content/content/ContentWorker.java
+++ b/applications/content/src/org/ofbiz/content/content/ContentWorker.java
@@ -355,7 +355,7 @@ public static void renderSubContentAsText(LocalDispatcher dispatcher, Delegator
if (subContent == null) {
//throw new GeneralException("No sub-content found with map-key [" + mapKey + "] for content [" + contentId + "]");
- out.append("<!-- no sub-content found with map-key [" + mapKey + "] for content [" + contentId + "] -->");
+ Debug.logWarning("No sub-content found with map-key [" + mapKey + "] for content [" + contentId + "]", module);
} else {
String subContentId = subContent.getString("contentIdTo");
templateContext.put("mapKey", mapKey);
| 1
|
08c4c898182edbe97aadef1815cce50448f975cb
|
https://github.com/jupyter/notebook/commit/08c4c898182edbe97aadef1815cce50448f975cb
|
protect against chrome mishandling backslash as slash in URLs
|
diff --git a/notebook/auth/login.py b/notebook/auth/login.py
index d8289d7329..8dbd6112fc 100644
--- a/notebook/auth/login.py
+++ b/notebook/auth/login.py
@@ -39,6 +39,10 @@ def _redirect_safe(self, url, default=None):
"""
if default is None:
default = self.base_url
+ # protect chrome users from mishandling unescaped backslashes.
+ # \ is not valid in urls, but some browsers treat it as /
+ # instead of %5C, causing `\\` to behave as `//`
+ url = url.replace("\\", "%5C")
parsed = urlparse(url)
if parsed.netloc or not (parsed.path + '/').startswith(self.base_url):
# require that next_url be absolute path within our path
| 1
|
c894cc696861b0b2ecb2d614597e274587875f86
|
https://github.com/apache/qpid-broker-j/commit/c894cc696861b0b2ecb2d614597e274587875f86
|
QPID-8502: Upgrade jetty version
This closes #79
|
diff --git a/pom.xml b/pom.xml
index da05d51146..fe5b77d133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<fasterxml-jackson-version>2.11.2</fasterxml-jackson-version>
<fasterxml-jackson-databind-version>2.11.2</fasterxml-jackson-databind-version>
<slf4j-version>1.7.30</slf4j-version>
- <jetty-version>9.4.31.v20200723</jetty-version>
+ <jetty-version>9.4.35.v20201120</jetty-version>
<!-- dependency version numbers -->
<bonecp-version>0.7.1.RELEASE</bonecp-version>
| 0
|
68a216cd22721ea92e3e53f5ac318f180aac8a43
|
https://github.com/paritytech/parity/commit/68a216cd22721ea92e3e53f5ac318f180aac8a43
|
Cargo.lock: cargo update -p kvdb-rocksdb (#11447)
|
diff --git a/Cargo.lock b/Cargo.lock
index cb398bff65e..99fc2a004c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1135,7 +1135,7 @@ dependencies = [
"keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb-memorydb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"machine 0.1.0",
@@ -1503,7 +1503,7 @@ dependencies = [
"jsonrpc-server-utils 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1538,7 +1538,7 @@ dependencies = [
"ethcore-sync 1.12.0",
"ethereum-types 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"snapshot 0.1.0",
"spec 0.1.0",
@@ -2494,7 +2494,7 @@ dependencies = [
[[package]]
name = "kvdb-rocksdb"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2728,7 +2728,7 @@ name = "migration-rocksdb"
version = "0.1.0"
dependencies = [
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"macros 0.1.0",
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3113,7 +3113,7 @@ dependencies = [
"jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"migration-rocksdb 0.1.0",
"node-filter 1.12.0",
@@ -4410,7 +4410,7 @@ dependencies = [
"keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hasher 0.1.1",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4456,7 +4456,7 @@ dependencies = [
"keccak-hash 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hasher 0.1.1",
"kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5767,7 +5767,7 @@ dependencies = [
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum kvdb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8396be0e5561ccd1bf7ff0b2007487cdd7a87a056873fe6ea906b35d4dbf7ed8"
"checksum kvdb-memorydb 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d25ef14155e418515c4839e9144c839de3506e68946f255a32b7f166095493d"
-"checksum kvdb-rocksdb 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "af488cc16c3801705c8d681c3a32c8faa8fafc7fb5309dee0f573f3c6a19d395"
+"checksum kvdb-rocksdb 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a1053e90a54421a842b6bf5d0e4a5cb5364c0bf570f713c58e44a9906f501d9"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
"checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0"
"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
| 0
|
6caf902f527250ee4b7b695929b628d560e0dad1
|
https://github.com/apache/incubator-openwhisk-runtime-php/commit/6caf902f527250ee4b7b695929b628d560e0dad1
|
Update tests to pick up upstream changes.
|
diff --git a/core/php7.1Action/CHANGELOG.md b/core/php7.1Action/CHANGELOG.md
index 57ff219..8ad347b 100644
--- a/core/php7.1Action/CHANGELOG.md
+++ b/core/php7.1Action/CHANGELOG.md
@@ -17,6 +17,10 @@
#
-->
+## 1.0.2
+Changes:
+ - Disallow re-initialization of function.
+
## 1.0.1
- Change: Update PHP to 7.1.18
diff --git a/core/php7.1Action/router.php b/core/php7.1Action/router.php
index d023f1a..76d8765 100644
--- a/core/php7.1Action/router.php
+++ b/core/php7.1Action/router.php
@@ -108,7 +108,7 @@ function init() : array
$binary = $data['binary'] ?? false; // code is binary?
if (!$code) {
- throw new RuntimeException("No code to execute");
+ throw new RuntimeException("Missing main/no code to execute.");
}
if ($binary) {
diff --git a/core/php7.2Action/CHANGELOG.md b/core/php7.2Action/CHANGELOG.md
index 702b708..4e4c56e 100644
--- a/core/php7.2Action/CHANGELOG.md
+++ b/core/php7.2Action/CHANGELOG.md
@@ -17,6 +17,10 @@
#
-->
+## 1.0.1
+Changes:
+ - Disallow re-initialization of function.
+
## 1.0.0
Initial release
diff --git a/core/php7.2Action/router.php b/core/php7.2Action/router.php
index 87456d1..bbf50e1 100644
--- a/core/php7.2Action/router.php
+++ b/core/php7.2Action/router.php
@@ -139,7 +139,7 @@ function init() : array
$binary = $data['binary'] ?? false; // code is binary?
if (!$code) {
- throw new RuntimeException("No code to execute");
+ throw new RuntimeException("Missing main/no code to execute.");
}
if ($binary) {
diff --git a/tests/.pydevproject b/tests/.pydevproject
deleted file mode 100644
index 40e9f40..0000000
--- a/tests/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>
diff --git a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala
index 000d0b0..5e5c9e7 100644
--- a/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/Php7ActionContainerTests.scala
@@ -27,11 +27,10 @@ import spray.json._
@RunWith(classOf[JUnitRunner])
abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskActorSystem {
- // note: "out" will not be empty as the PHP web server outputs a message when
- // it starts up
+ // note: "out" will not be empty as the PHP web server outputs a message when it starts up
val enforceEmptyOutputStream = false
- lazy val phpContainerImageName = "action-php-v7.x"
+ lazy val phpContainerImageName: String = ???
override def withActionContainer(env: Map[String, String] = Map.empty)(code: ActionContainer => Unit) = {
withContainer(phpContainerImageName, env)(code)
@@ -41,30 +40,56 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA
behavior of phpContainerImageName
- testEcho(Seq {
- (
- "PHP",
+ override val testNoSourceOrExec = TestConfig("")
+
+ override val testNotReturningJson = {
+ TestConfig(
+ """
+ |<?php
+ |function main(array $args) {
+ | return "not a json object";
+ |}
+ """.stripMargin,
+ enforceEmptyOutputStream = enforceEmptyOutputStream,
+ enforceEmptyErrorStream = false)
+ }
+
+ override val testInitCannotBeCalledMoreThanOnce = {
+ TestConfig(
"""
- |<?php
- |function main(array $args) : array {
- | echo 'hello stdout';
- | error_log('hello stderr');
- | return $args;
- |}
- """.stripMargin)
- })
-
- testNotReturningJson("""
|<?php
- |function main(array $args) {
- | return "not a json object";
+ |function main(array $args) : array {
+ | return $args;
|}
- """.stripMargin)
+ """.stripMargin,
+ enforceEmptyOutputStream = enforceEmptyOutputStream)
+ }
- testUnicode(Seq {
- (
- "PHP",
+ override val testEntryPointOtherThanMain = {
+ TestConfig(
"""
+ | <?php
+ | function niam(array $args) {
+ | return $args;
+ | }
+ """.stripMargin,
+ main = "niam",
+ enforceEmptyOutputStream = enforceEmptyOutputStream)
+ }
+
+ override val testEcho = {
+ TestConfig("""
+ |<?php
+ |function main(array $args) : array {
+ | echo 'hello stdout';
+ | error_log('hello stderr');
+ | return $args;
+ |}
+ """.stripMargin)
+ }
+
+ override val testUnicode = {
+ TestConfig("""
|<?php
|function main(array $args) : array {
| $str = $args['delimiter'] . " ☃ " . $args['delimiter'];
@@ -72,37 +97,37 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA
| return ["winter" => $str];
|}
""".stripMargin.trim)
- })
+ }
- testEnv(
- Seq {
- (
- "PHP",
- """
- |<?php
- |function main(array $args) : array {
- | return [
- | "env" => $_ENV,
- | "api_host" => $_ENV['__OW_API_HOST'],
- | "api_key" => $_ENV['__OW_API_KEY'],
- | "namespace" => $_ENV['__OW_NAMESPACE'],
- | "action_name" => $_ENV['__OW_ACTION_NAME'],
- | "activation_id" => $_ENV['__OW_ACTIVATION_ID'],
- | "deadline" => $_ENV['__OW_DEADLINE'],
- | ];
- |}
- """.stripMargin.trim)
- },
- enforceEmptyOutputStream)
-
- testInitCannotBeCalledMoreThanOnce("""
- |<?php
- |function main(array $args) : array {
- | echo 'hello stdout';
- | error_log('hello stderr');
- | return $args;
- |}
- """.stripMargin)
+ override val testEnv = {
+ TestConfig(
+ """
+ |<?php
+ |function main(array $args) : array {
+ | return [
+ | "env" => $_ENV,
+ | "api_host" => $_ENV['__OW_API_HOST'],
+ | "api_key" => $_ENV['__OW_API_KEY'],
+ | "namespace" => $_ENV['__OW_NAMESPACE'],
+ | "action_name" => $_ENV['__OW_ACTION_NAME'],
+ | "activation_id" => $_ENV['__OW_ACTIVATION_ID'],
+ | "deadline" => $_ENV['__OW_DEADLINE'],
+ | ];
+ |}
+ """.stripMargin.trim,
+ enforceEmptyOutputStream = enforceEmptyOutputStream)
+ }
+
+ override val testLargeInput = {
+ TestConfig("""
+ |<?php
+ |function main(array $args) : array {
+ | echo 'hello stdout';
+ | error_log('hello stderr');
+ | return $args;
+ |}
+ """.stripMargin)
+ }
it should "fail to initialize with bad code" in {
val (out, err) = withPhp7Container { c =>
@@ -127,19 +152,6 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA
})
}
- it should "fail to initialize with no code" in {
- val (out, err) = withPhp7Container { c =>
- val code = ""
-
- val (initCode, error) = c.init(initPayload(code))
-
- initCode should not be (200)
- error shouldBe a[Some[_]]
- error.get shouldBe a[JsObject]
- error.get.fields("error").toString should include("No code to execute")
- }
- }
-
it should "return some error on action error" in {
val (out, err) = withPhp7Container { c =>
val code = """
@@ -467,21 +479,6 @@ abstract class Php7ActionContainerTests extends BasicActionRunnerTests with WskA
})
}
- it should "support actions using non-default entry point" in {
- val (out, err) = withPhp7Container { c =>
- val code = """
- | <?php
- | function niam(array $args) {
- | return [result => "it works"];
- | }
- """.stripMargin
-
- c.init(initPayload(code, main = "niam"))._1 should be(200)
- val (runCode, runRes) = c.run(runPayload(JsObject()))
- runRes.get.fields.get("result") shouldBe Some(JsString("it works"))
- }
- }
-
it should "support zipped actions using non-default entry point" in {
val srcs = Seq(Seq("index.php") -> """
| <?php
| 1
|
38a4a64300a2a9d228bcaf436bea8f368bc20fc5
|
https://github.com/dspinhirne/netaddr-rb/commit/38a4a64300a2a9d228bcaf436bea8f368bc20fc5
|
Merge branch 'master' of github.com:dspinhirne/netaddr-rb
|
diff --git a/lib/mask128.rb b/lib/mask128.rb
index 6f297bd..8d24093 100755
--- a/lib/mask128.rb
+++ b/lib/mask128.rb
@@ -30,7 +30,9 @@ def Mask128.parse(mask)
if (mask.start_with?("/")) # cidr format
mask = mask[1..-1] # remove "/"
end
- return Mask128.new(mask.to_i)
+ return Mask128.new(Integer(mask))
+ rescue ArgumentError
+ raise ValidationError, "#{mask} is not valid integer."
end
#cmp compares equality with another Mask128. Return:
diff --git a/lib/mask32.rb b/lib/mask32.rb
index debe8e7..7cc719a 100755
--- a/lib/mask32.rb
+++ b/lib/mask32.rb
@@ -28,9 +28,15 @@ def initialize(prefix_len)
def Mask32.parse(mask)
mask.strip!
if (mask.start_with?("/")) # cidr format
- return Mask32.new(mask[1..-1].to_i) # remove "/"
- elsif (!mask.include?("."))
- return Mask32.new(mask.to_i)
+ mask = mask[1..-1] # remove "/"
+ end
+
+ if (!mask.include?("."))
+ begin
+ return Mask32.new(Integer(mask))
+ rescue ArgumentError
+ raise ValidationError, "#{mask} is not valid integer."
+ end
end
# for extended netmask
| 0
|
17c363a5162fd4dc77b1df54e48d7bd9bf6b3be7
|
https://github.com/FreeRDP/FreeRDP/commit/17c363a5162fd4dc77b1df54e48d7bd9bf6b3be7
|
Fixed CVE-2018-8784
Thanks to Eyal Itkin from Check Point Software Technologies.
|
diff --git a/libfreerdp/codec/zgfx.c b/libfreerdp/codec/zgfx.c
index f94c41b2031..551fffc830f 100644
--- a/libfreerdp/codec/zgfx.c
+++ b/libfreerdp/codec/zgfx.c
@@ -137,6 +137,7 @@ static INLINE BOOL zgfx_GetBits(ZGFX_CONTEXT* _zgfx, UINT32 _nbits)
_zgfx->cBitsCurrent -= _nbits;
_zgfx->bits = _zgfx->BitsCurrent >> _zgfx->cBitsCurrent;
_zgfx->BitsCurrent &= ((1 << _zgfx->cBitsCurrent) - 1);
+ return TRUE;
}
static void zgfx_history_buffer_ring_write(ZGFX_CONTEXT* zgfx, const BYTE* src, size_t count)
@@ -229,9 +230,15 @@ static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t
UINT32 count;
UINT32 distance;
BYTE* pbSegment;
- size_t cbSegment = segmentSize - 1;
+ size_t cbSegment;
- if ((Stream_GetRemainingLength(stream) < segmentSize) || (segmentSize < 1))
+ if (!zgfx || !stream)
+ return FALSE;
+
+ cbSegment = segmentSize - 1;
+
+ if ((Stream_GetRemainingLength(stream) < segmentSize) || (segmentSize < 1) ||
+ (segmentSize > UINT32_MAX))
return FALSE;
Stream_Read_UINT8(stream, flags); /* header (1 byte) */
@@ -242,6 +249,10 @@ static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t
if (!(flags & PACKET_COMPRESSED))
{
zgfx_history_buffer_ring_write(zgfx, pbSegment, cbSegment);
+
+ if (cbSegment > sizeof(zgfx->OutputBuffer))
+ return FALSE;
+
CopyMemory(zgfx->OutputBuffer, pbSegment, cbSegment);
zgfx->OutputCount = cbSegment;
return TRUE;
@@ -280,6 +291,9 @@ static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t
if (++zgfx->HistoryIndex == zgfx->HistoryBufferSize)
zgfx->HistoryIndex = 0;
+ if (zgfx->OutputCount >= sizeof(zgfx->OutputBuffer))
+ return FALSE;
+
zgfx->OutputBuffer[zgfx->OutputCount++] = c;
}
else
@@ -313,6 +327,9 @@ static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t
count += zgfx->bits;
}
+ if (count > sizeof(zgfx->OutputBuffer) - zgfx->OutputCount)
+ return FALSE;
+
zgfx_history_buffer_ring_read(zgfx, distance, &(zgfx->OutputBuffer[zgfx->OutputCount]), count);
zgfx_history_buffer_ring_write(zgfx, &(zgfx->OutputBuffer[zgfx->OutputCount]), count);
zgfx->OutputCount += count;
@@ -325,6 +342,10 @@ static BOOL zgfx_decompress_segment(ZGFX_CONTEXT* zgfx, wStream* stream, size_t
zgfx->cBitsRemaining -= zgfx->cBitsCurrent;
zgfx->cBitsCurrent = 0;
zgfx->BitsCurrent = 0;
+
+ if (count > sizeof(zgfx->OutputBuffer) - zgfx->OutputCount)
+ return FALSE;
+
CopyMemory(&(zgfx->OutputBuffer[zgfx->OutputCount]), zgfx->pbInputCurrent, count);
zgfx_history_buffer_ring_write(zgfx, zgfx->pbInputCurrent, count);
zgfx->pbInputCurrent += count;
| 1
|
2b56f23fe5da8cba68feadbd89f41146f84a68ea
|
https://github.com/timburks/nu/commit/2b56f23fe5da8cba68feadbd89f41146f84a68ea
|
updated libffi
|
diff --git a/libffi b/libffi
index 284900b..7d504f7 160000
--- a/libffi
+++ b/libffi
@@ -1 +1 @@
-Subproject commit 284900b74030d725da528461e53dc2354c1dca6a
+Subproject commit 7d504f7a8e33f6da27941f5dc5d889fe60b8b9c8
| 0
|
8eb3080720ad64856614dad38fc391702bef36aa
|
https://github.com/OpenSC/pam_p11/commit/8eb3080720ad64856614dad38fc391702bef36aa
|
post pam_p11-0.3.1
|
diff --git a/configure.ac b/configure.ac
index 891a3e5..c813df7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.60)
define([PACKAGE_VERSION_MAJOR], [0])
define([PACKAGE_VERSION_MINOR], [3])
define([PACKAGE_VERSION_FIX], [1])
-define([PACKAGE_SUFFIX], [])
+define([PACKAGE_SUFFIX], [_git])
define([PRODUCT_BUGREPORT], [https://github.com/OpenSC/pam_p11/issues])
AC_INIT([pam_p11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX],[PRODUCT_BUGREPORT])
| 0
|
b49fa93aa759cb2e2e22e174ef793470eb02a148
|
https://github.com/kbabioch/openjpeg/commit/b49fa93aa759cb2e2e22e174ef793470eb02a148
|
openjp3d: Convert ISO-8859 to UTF-8
Signed-off-by: Stefan Weil <[email protected]>
|
diff --git a/src/lib/openjp3d/dwt.c b/src/lib/openjp3d/dwt.c
index 90a807ed1..086743370 100644
--- a/src/lib/openjp3d/dwt.c
+++ b/src/lib/openjp3d/dwt.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyrigth (c) 2006, M�nica D�ez, LPI-UVA, Spain
+ * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/dwt.h b/src/lib/openjp3d/dwt.h
index 634df95a1..0d3eca2a2 100644
--- a/src/lib/openjp3d/dwt.h
+++ b/src/lib/openjp3d/dwt.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyrigth (c) 2006, M�nica D�ez, LPI-UVA, Spain
+ * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,7 @@ Get the norm of a wavelet function of a subband at a specified level for the rev
double dwt_getnorm(int orient, int level[3], int dwtid[3]);
/* ----------------------------------------------------------------------- */
/**
-Calcula el valor del escal�n de cuantificaci�n correspondiente a cada subbanda.
+Calcula el valor del escalón de cuantificación correspondiente a cada subbanda.
@param tccp Tile component coding parameters
@param prec Precision of data
*/
diff --git a/src/lib/openjp3d/jp3d.c b/src/lib/openjp3d/jp3d.c
index fbc8c0139..410bca53d 100644
--- a/src/lib/openjp3d/jp3d.c
+++ b/src/lib/openjp3d/jp3d.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/jp3d.h b/src/lib/openjp3d/jp3d.h
index 3ad46df66..2f47ffe6d 100644
--- a/src/lib/openjp3d/jp3d.h
+++ b/src/lib/openjp3d/jp3d.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/openjp3d.c b/src/lib/openjp3d/openjp3d.c
index 02a2d0094..3299a99d0 100644
--- a/src/lib/openjp3d/openjp3d.c
+++ b/src/lib/openjp3d/openjp3d.c
@@ -5,7 +5,7 @@
* are granted under this license.
*
* Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/openjp3d.h b/src/lib/openjp3d/openjp3d.h
index 0dd8aed85..b61763e61 100644
--- a/src/lib/openjp3d/openjp3d.h
+++ b/src/lib/openjp3d/openjp3d.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/pi.c b/src/lib/openjp3d/pi.c
index 00a198dab..a03be45e7 100644
--- a/src/lib/openjp3d/pi.c
+++ b/src/lib/openjp3d/pi.c
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez, LPI-UVA, Spain
+ * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/pi.h b/src/lib/openjp3d/pi.h
index 59a73d55f..6e6118dde 100644
--- a/src/lib/openjp3d/pi.h
+++ b/src/lib/openjp3d/pi.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/t1_3d.c b/src/lib/openjp3d/t1_3d.c
index 91759e7ac..ce7e8db6a 100644
--- a/src/lib/openjp3d/t1_3d.c
+++ b/src/lib/openjp3d/t1_3d.c
@@ -1,5 +1,5 @@
/*
- * Copyrigth (c) 2006, M�nica D�ez, LPI-UVA, Spain
+ * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/t1_3d.h b/src/lib/openjp3d/t1_3d.h
index c7cf88762..4d0ad89cb 100644
--- a/src/lib/openjp3d/t1_3d.h
+++ b/src/lib/openjp3d/t1_3d.h
@@ -1,5 +1,5 @@
/*
- * Copyrigth (c) 2006, M�nica D�ez, LPI-UVA, Spain
+ * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/t2.h b/src/lib/openjp3d/t2.h
index b11bc6a57..36733f952 100644
--- a/src/lib/openjp3d/t2.h
+++ b/src/lib/openjp3d/t2.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/tcd.h b/src/lib/openjp3d/tcd.h
index a94c54fc2..bac5cd06b 100644
--- a/src/lib/openjp3d/tcd.h
+++ b/src/lib/openjp3d/tcd.h
@@ -9,7 +9,7 @@
* Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/src/lib/openjp3d/volume.h b/src/lib/openjp3d/volume.h
index 8cc6102ac..ae7fdc224 100644
--- a/src/lib/openjp3d/volume.h
+++ b/src/lib/openjp3d/volume.h
@@ -5,7 +5,7 @@
* are granted under this license.
*
* Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006, M�nica D�ez Garc�a, Image Processing Laboratory, University of Valladolid, Spain
+ * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
| 0
|
e52393740334443ae0206cab2d7caef381646725
|
https://github.com/neomutt/neomutt/commit/e52393740334443ae0206cab2d7caef381646725
|
quote imap strings more carefully
Co-authored-by: JerikoOne <[email protected]>
|
diff --git a/imap/auth_login.c b/imap/auth_login.c
index f6de066126..0f4445b453 100644
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -65,8 +65,8 @@ enum ImapAuthRes imap_auth_login(struct ImapData *idata, const char *method)
mutt_message(_("Logging in..."));
- imap_quote_string(q_user, sizeof(q_user), idata->conn->account.user);
- imap_quote_string(q_pass, sizeof(q_pass), idata->conn->account.pass);
+ imap_quote_string(q_user, sizeof(q_user), idata->conn->account.user, false);
+ imap_quote_string(q_pass, sizeof(q_pass), idata->conn->account.pass, false);
/* don't print the password unless we're at the ungodly debugging level
* of 5 or higher */
diff --git a/imap/command.c b/imap/command.c
index e3378e1e3d..859f98727c 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -499,7 +499,7 @@ static void cmd_parse_lsub(struct ImapData *idata, char *s)
mutt_str_strfcpy(buf, "mailboxes \"", sizeof(buf));
mutt_account_tourl(&idata->conn->account, &url);
/* escape \ and " */
- imap_quote_string(errstr, sizeof(errstr), list.name);
+ imap_quote_string(errstr, sizeof(errstr), list.name, true);
url.path = errstr + 1;
url.path[strlen(url.path) - 1] = '\0';
if (mutt_str_strcmp(url.user, ImapUser) == 0)
diff --git a/imap/imap.c b/imap/imap.c
index ea12470b00..40f620a2e2 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -464,7 +464,7 @@ static int compile_search(struct Context *ctx, const struct Pattern *pat, struct
return -1;
}
*delim = '\0';
- imap_quote_string(term, sizeof(term), pat->p.str);
+ imap_quote_string(term, sizeof(term), pat->p.str, false);
mutt_buffer_addstr(buf, term);
mutt_buffer_addch(buf, ' ');
@@ -472,17 +472,17 @@ static int compile_search(struct Context *ctx, const struct Pattern *pat, struct
*delim = ':';
delim++;
SKIPWS(delim);
- imap_quote_string(term, sizeof(term), delim);
+ imap_quote_string(term, sizeof(term), delim, false);
mutt_buffer_addstr(buf, term);
break;
case MUTT_BODY:
mutt_buffer_addstr(buf, "BODY ");
- imap_quote_string(term, sizeof(term), pat->p.str);
+ imap_quote_string(term, sizeof(term), pat->p.str, false);
mutt_buffer_addstr(buf, term);
break;
case MUTT_WHOLE_MSG:
mutt_buffer_addstr(buf, "TEXT ");
- imap_quote_string(term, sizeof(term), pat->p.str);
+ imap_quote_string(term, sizeof(term), pat->p.str, false);
mutt_buffer_addstr(buf, term);
break;
case MUTT_SERVERSEARCH:
@@ -495,7 +495,7 @@ static int compile_search(struct Context *ctx, const struct Pattern *pat, struct
}
}
mutt_buffer_addstr(buf, "X-GM-RAW ");
- imap_quote_string(term, sizeof(term), pat->p.str);
+ imap_quote_string(term, sizeof(term), pat->p.str, false);
mutt_buffer_addstr(buf, term);
break;
}
diff --git a/imap/imap_private.h b/imap/imap_private.h
index 6ae9f05ad7..278d4a2b13 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -328,7 +328,7 @@ char *imap_get_qualifier(char *buf);
int imap_mxcmp(const char *mx1, const char *mx2);
char *imap_next_word(char *s);
void imap_qualify_path(char *dest, size_t len, struct ImapMbox *mx, char *path);
-void imap_quote_string(char *dest, size_t dlen, const char *src);
+void imap_quote_string(char *dest, size_t dlen, const char *src, bool quote_backtick);
void imap_unquote_string(char *s);
void imap_munge_mbox_name(struct ImapData *idata, char *dest, size_t dlen, const char *src);
void imap_unmunge_mbox_name(struct ImapData *idata, char *s);
diff --git a/imap/util.c b/imap/util.c
index 23e4f70937..614d87a561 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -798,9 +798,12 @@ void imap_qualify_path(char *dest, size_t len, struct ImapMbox *mx, char *path)
*
* Surround string with quotes, escape " and \ with backslash
*/
-void imap_quote_string(char *dest, size_t dlen, const char *src)
+void imap_quote_string(char *dest, size_t dlen, const char *src, bool quote_backtick)
{
- static const char quote[] = "\"\\";
+ const char *quote = "`\"\\";
+ if (!quote_backtick)
+ quote++;
+
char *pt = dest;
const char *s = src;
@@ -874,7 +877,7 @@ void imap_munge_mbox_name(struct ImapData *idata, char *dest, size_t dlen, const
char *buf = mutt_str_strdup(src);
imap_utf_encode(idata, &buf);
- imap_quote_string(dest, dlen, buf);
+ imap_quote_string(dest, dlen, buf, false);
FREE(&buf);
}
| 1
|
36dabacfa1a4be46a75d434995e441afec893ff7
|
https://github.com/MISP/MISP/commit/36dabacfa1a4be46a75d434995e441afec893ff7
|
new: [rest] Allow to search sightings by event or attribute UUID
|
diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index f4d690de32..76dfe5c327 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -241,9 +241,9 @@ class RestResponseComponent extends Component
'optional' => array('type', 'source', 'timestamp', 'date', 'time')
),
'restSearch' => array(
- 'description' => "Search MISP sightings using a list of filter parameters and return the data in the JSON format. The search is available on an event, attribute or instance level, just select the scope via the URL (/sighting/restSearch/event vs /sighting/restSearch/attribute vs /sighting/restSearch/). id MUST be provided if context is set.",
+ 'description' => "Search MISP sightings using a list of filter parameters and return the data in the JSON format. The search is available on an event, attribute or instance level, just select the scope via the URL (/sighting/restSearch/event vs /sighting/restSearch/attribute vs /sighting/restSearch/). id or uuid MUST be provided if context is set.",
'mandatory' => array('returnFormat'),
- 'optional' => array('id', 'type', 'from', 'to', 'last', 'org_id', 'source', 'includeAttribute', 'includeEvent'),
+ 'optional' => array('id', 'uuid', 'type', 'from', 'to', 'last', 'org_id', 'source', 'includeAttribute', 'includeEvent'),
'params' => array('context')
),
),
diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
index b5303a8705..9b7e88f440 100644
--- a/app/Model/Sighting.php
+++ b/app/Model/Sighting.php
@@ -789,9 +789,9 @@ public function restSearch($user, $returnFormat, $filters)
if (isset($filters['context']) && !in_array($filters['context'], $allowedContext, true)) {
throw new MethodNotAllowedException(__('Invalid context.'));
}
- // ensure that an id is provided if context is set
- if (!empty($filters['context']) && !isset($filters['id'])) {
- throw new MethodNotAllowedException(__('An id must be provided if the context is set.'));
+ // ensure that an id or uuid is provided if context is set
+ if (!empty($filters['context']) && !(isset($filters['id']) || isset($filters['uuid'])) ) {
+ throw new MethodNotAllowedException(__('An ID or UUID must be provided if the context is set.'));
}
if (!isset($this->validFormats[$returnFormat][1])) {
@@ -811,7 +811,9 @@ public function restSearch($user, $returnFormat, $filters)
} else {
$timeCondition = '30d';
}
- $conditions = $this->Attribute->setTimestampConditions($timeCondition, array(), $scope = 'Sighting.date_sighting');
+
+ $contain = [];
+ $conditions = $this->Attribute->setTimestampConditions($timeCondition, [], $scope = 'Sighting.date_sighting');
if (isset($filters['type'])) {
$conditions['Sighting.type'] = $filters['type'];
@@ -824,7 +826,11 @@ public function restSearch($user, $returnFormat, $filters)
}
foreach ($filters['org_id'] as $k => $org_id) {
if (Validation::uuid($org_id)) {
- $org = $this->Organisation->find('first', array('conditions' => array('Organisation.uuid' => $org_id), 'recursive' => -1, 'fields' => array('Organisation.id')));
+ $org = $this->Organisation->find('first', array(
+ 'conditions' => array('Organisation.uuid' => $org_id),
+ 'recursive' => -1,
+ 'fields' => array('Organisation.id'),
+ ));
if (empty($org)) {
$filters['org_id'][$k] = -1;
} else {
@@ -847,13 +853,23 @@ public function restSearch($user, $returnFormat, $filters)
}
}
+ if (!empty($filters['uuid'])) {
+ if ($filters['context'] === 'attribute') {
+ $conditions['Attribute.uuid'] = $filters['uuid'];
+ $contain[] = 'Attribute';
+ } elseif ($filters['context'] === 'event') {
+ $conditions['Event.uuid'] = $filters['uuid'];
+ $contain[] = 'Event';
+ }
+ }
+
// fetch sightings matching the query
$sightings = $this->find('list', array(
'recursive' => -1,
'conditions' => $conditions,
'fields' => array('id'),
+ 'contain' => $contain,
));
- $sightings = array_values($sightings);
$filters['requested_attributes'] = array('id', 'attribute_id', 'event_id', 'org_id', 'date_sighting', 'uuid', 'source', 'type');
@@ -879,9 +895,7 @@ public function restSearch($user, $returnFormat, $filters)
$filters['requested_attributes'] = array_merge($filters['requested_attributes'], array('event_uuid', 'event_orgc_id', 'event_org_id', 'event_info', 'event_Orgc_name'));
$additional_event_added = true;
}
- if (!empty($sight)) {
- array_push($allowedSightings, $sight);
- }
+ $allowedSightings[] = $sight;
}
}
@@ -889,11 +903,6 @@ public function restSearch($user, $returnFormat, $filters)
'conditions' => array(), //result already filtered
);
- if (!isset($this->validFormats[$returnFormat])) {
- // this is where the new code path for the export modules will go
- throw new NotFoundException('Invalid export format.');
- }
-
$exportToolParams = array(
'user' => $user,
'params' => $params,
| 0
|
a2c8c703abc126d6231f65fa66c051004b2f5748
|
https://github.com/mongodb/mongo-php-driver-legacy/commit/a2c8c703abc126d6231f65fa66c051004b2f5748
|
Fixed PHP-1462: Don't expose php_hash_copy by marking it static
|
diff --git a/contrib/crypto.c b/contrib/crypto.c
index 70602a65d..a335dd990 100644
--- a/contrib/crypto.c
+++ b/contrib/crypto.c
@@ -21,7 +21,7 @@
#include "crypto.h"
#include <ext/standard/sha1.h>
-int php_hash_copy(const void *ops, void *orig_context, void *dest_context) /* {{{ */
+static int php_hash_copy(const void *ops, void *orig_context, void *dest_context) /* {{{ */
{
php_hash_ops *hash_ops = (php_hash_ops *)ops;
| 0
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.