Merge 1.4.0 changes back to master.

extensions/guacamole-auth-json/doc/README.md

@@ -133,11 +133,11 @@ will be in the Tomcat logs, however.
 Reference implementation
 ------------------------
 
-The source includes a shell script, `doc/encrypt-json.sh`, which uses the
-OpenSSL command-line utility to encrypt and sign JSON in the manner that
-guacamole-auth-json requires. It is thoroughly commented and should work well
-as a reference implementation, for testing, and as a point of comparison for
-development. The script is run as:
+The included shell script, `doc/encrypt-json.sh`, uses the OpenSSL command-line
+utility to encrypt and sign JSON in the manner that guacamole-auth-json
+requires. It is thoroughly commented and should work well as a reference
+implementation, for testing, and as a point of comparison for development. The
+script is run as:
 
     $ ./encrypt-json.sh HEX_ENCRYPTION_KEY file-to-sign-and-encrypt.json
 

extensions/guacamole-auth-json/src/main/assembly/dist.xml

@@ -40,6 +40,12 @@
             <directory>target/licenses</directory>
         </fileSet>
 
+        <!-- Include reference implementation -->
+        <fileSet>
+            <outputDirectory>doc</outputDirectory>
+            <directory>doc</directory>
+        </fileSet>
+
         <!-- Include extension .jar -->
         <fileSet>
             <directory>target</directory>

guacamole-ext/src/main/java/org/apache/guacamole/properties/ByteArrayProperty.java

@@ -39,7 +39,7 @@ public abstract class ByteArrayProperty implements GuacamoleProperty<byte[]> {
 
         // Return value parsed from hex
         try {
-            return BaseEncoding.base16().decode(value);
+            return BaseEncoding.base16().decode(value.toUpperCase());
         }
 
         // Fail parse if hex invalid