Imported Upstream version 0.11.6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a810bd4cf74ade6b7b604282daf238b9de38a4c..bbdad872792009c538b62b820159ed7f7ec749ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ PROJECT( libwbxml C )
 
 SET( LIBWBXML_VERSION_MAJOR "0" )
 SET( LIBWBXML_VERSION_MINOR "11" )
-SET( LIBWBXML_VERSION_PATCH "5" )
+SET( LIBWBXML_VERSION_PATCH "6" )
 IF( LIBWBXML_VERSION_BETA )
     IF( LIBWBXML_VERSION_BETA VERSION_GREATER 90 )
         MATH( EXPR LIBWBXML_VERSION_MINOR "${LIBWBXML_VERSION_MINOR} - 1" )
@@ -23,7 +23,7 @@ SET( LIBWBXML_LIBVERSION_CURRENT 1 )
 # UPDATE: last release.
 # UPDATE: Set REVISION to 0 if any interface have been added, removed or
 # UPDATE: changed since the last update.
-SET( LIBWBXML_LIBVERSION_REVISION 5 )
+SET( LIBWBXML_LIBVERSION_REVISION 6 )
 
 # The difference between the newest and the oldest interfaces.
 # UPDATE: If any interface have been added since the last public

diff --git a/ChangeLog b/ChangeLog
index d8894bcd169b734eff79b242ecc20650ae08228a..396b04b62e42cfaf4162bced704b7ec135ef5659 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-15  Michael Bell <michael.bell@web.de>
+  * Released 0.11.6
+  * Fixed/changed the encoding of element Content in CodePage
+    AirSyncBase (0x11) to WBXML_BINARY_OPTION for Microsoft ActiveSync.
+    This element is used when the clients send a request to save a draft
+    email. An example can be found in:
+      http://interoperability.blob.core.windows.net/files/MS-ASEMAIL/[MS-ASEMAIL].pdf
+    (4.4 Adding a Draft Email with Attachments).
+    Reference:
+      https://msdn.microsoft.com/en-us/library/mt563406%28v=exchg.80%29.aspx
+    (issue #58 from Thomas Führer)
+  * Added a testcase for Microsoft ActiveSync EAS Provisioning
+    (clarifies issue #56).
+
 2017-02-12  Michael Bell <michael.bell@web.de>
   * Released 0.11.5
   * Fixed ActiveSync element data of code pages ResolveRecipients and

diff --git a/RELEASE b/RELEASE
index 97e6c3cd61e4cd2ba95954da2662678cb1b222fb..2be69a29fa16f2b664080ba911f646ffbbace1ec 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -24,7 +24,6 @@ To make a release of libwbxml, do the following:
     * Reset to 0 if any interface has been removed since last release.
       If any interface has been added then increment.
 
-
  - Run "make test" again several times to try to see race conditions.
    "cd trunk"
    "cmake . -B/tmp/build/libwbxml"

diff --git a/src/wbxml_tables.c b/src/wbxml_tables.c
index fc678f8a17a78d578c68dbe563a05d10379d474d..867d0f48bc611fa889f3b96520c55a992d37ab70 100644 (file)
--- a/src/wbxml_tables.c
+++ b/src/wbxml_tables.c
@@ -3088,7 +3088,7 @@ const WBXMLTagEntry sv_airsync_tag_table[] = {
     { "Add",                    0x11, 0x1c }, /* since 16.0 */
     { "Delete",                 0x11, 0x1d }, /* since 16.0 */
     { "ClientId",               0x11, 0x1e }, /* since 16.0 */
-    { "Content",                0x11, 0x1f }, /* since 16.0 */
+    { "Content",                0x11, 0x1f, WBXML_TAG_OPTION_BINARY }, /* since 16.0 */
     { "Location",               0x11, 0x20 }, /* since 16.0 */
     { "Annotation",             0x11, 0x21 }, /* since 16.0 */
     { "Street",                 0x11, 0x22 }, /* since 16.0 */

diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 3ee8044be00cbe6498c65c0f56fe1351ab31f110..c6918cf351d9048fa18cac0bd71379faa383acd6 100644 (file)
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -2,7 +2,7 @@
 ENABLE_TESTING()
 CONFIGURE_FILE( "launchTests.sh" "${CMAKE_CURRENT_BINARY_DIR}/launchTests.sh")
 CONFIGURE_FILE( "normalize_xml.pl" "${CMAKE_CURRENT_BINARY_DIR}/normalize_xml.pl" @ONLY)
-SET( activesync_tests 13 )
+SET( activesync_tests 14 )
 SET( airsync_tests 4 )
 SET( ddf_tests 2 )
 # 2009-Jan-19 bellmich

diff --git a/test/tools/activesync/activesync-012-provision-eas.xml b/test/tools/activesync/activesync-012-provision-eas.xml
new file mode 100644 (file)
index 0000000..e507a64
--- /dev/null
+++ b/test/tools/activesync/activesync-012-provision-eas.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE ActiveSync PUBLIC "-//MICROSOFT//DTD ActiveSync//EN" "http://www.microsoft.com/">
+<Provision xmlns="Provision:">
+  <DeviceInformation xmlns="Settings:">
+    <Status>1</Status>
+  </DeviceInformation>
+  <Status>1</Status>
+  <Policies>
+    <Policy>
+      <PolicyType>MS-EAS-Provisioning-WBXML</PolicyType>
+      <Status>1</Status>
+      <PolicyKey>1686474474</PolicyKey>
+      <Data>
+        <EASProvisionDoc>
+          <DevicePasswordEnabled>0</DevicePasswordEnabled>
+          <AlphanumericDevicePasswordRequired>0</AlphanumericDevicePasswordRequired>
+          <PasswordRecoveryEnabled>0</PasswordRecoveryEnabled>
+          <!-- <RequireStorageCardEncryption>0</RequireStorageCardEncryption> -->
+          <!-- Microsoft renamed this element -->
+          <DeviceEncryptionEnabled>0</DeviceEncryptionEnabled>
+          <AttachmentsEnabled>1</AttachmentsEnabled>
+          <MinDevicePasswordLength/>
+          <MaxInactivityTimeDeviceLock/>
+          <MaxDevicePasswordFailedAttempts/>
+          <MaxAttachmentSize/>
+          <AllowSimpleDevicePassword>1</AllowSimpleDevicePassword>
+          <DevicePasswordExpiration/>
+          <DevicePasswordHistory>0</DevicePasswordHistory>
+          <AllowStorageCard>1</AllowStorageCard>
+          <AllowCamera>1</AllowCamera>
+          <RequireDeviceEncryption>0</RequireDeviceEncryption>
+          <AllowUnsignedApplications>1</AllowUnsignedApplications>
+          <AllowUnsignedInstallationPackages>1</AllowUnsignedInstallationPackages>
+          <MinDevicePasswordComplexCharacters>1</MinDevicePasswordComplexCharacters>
+          <AllowWiFi>1</AllowWiFi>
+          <AllowTextMessaging>1</AllowTextMessaging>
+          <AllowPOPIMAPEmail>1</AllowPOPIMAPEmail>
+          <AllowBluetooth>2</AllowBluetooth>
+          <AllowIrDA>1</AllowIrDA>
+          <RequireManualSyncWhenRoaming>0</RequireManualSyncWhenRoaming>
+          <AllowDesktopSync>1</AllowDesktopSync>
+          <MaxCalendarAgeFilter>0</MaxCalendarAgeFilter>
+          <AllowHTMLEmail>1</AllowHTMLEmail>
+          <MaxEmailAgeFilter>0</MaxEmailAgeFilter>
+          <MaxEmailBodyTruncationSize>-1</MaxEmailBodyTruncationSize>
+          <MaxEmailHTMLBodyTruncationSize>-1</MaxEmailHTMLBodyTruncationSize>
+          <RequireSignedSMIMEMessages>0</RequireSignedSMIMEMessages>
+          <RequireEncryptedSMIMEMessages>0</RequireEncryptedSMIMEMessages>
+          <RequireSignedSMIMEAlgorithm>0</RequireSignedSMIMEAlgorithm>
+          <RequireEncryptionSMIMEAlgorithm>0</RequireEncryptionSMIMEAlgorithm>
+          <AllowSMIMEEncryptionAlgorithmNegotiation>2</AllowSMIMEEncryptionAlgorithmNegotiation>
+          <AllowSMIMESoftCerts>1</AllowSMIMESoftCerts>
+          <AllowBrowser>1</AllowBrowser>
+          <AllowConsumerEmail>1</AllowConsumerEmail>
+          <AllowRemoteDesktop>1</AllowRemoteDesktop>
+          <AllowInternetSharing>1</AllowInternetSharing>
+          <UnapprovedInROMApplicationList/>
+          <ApprovedApplicationList/>
+        </EASProvisionDoc>
+      </Data>
+    </Policy>
+  </Policies>
+</Provision>