Merge pull request #1027 from guusdk/OF-1494_Invalid_xmppAddr_SAN

OF-1494: Fix the xmppAddr SAN othername entry in generated certs.

src/java/org/jivesoftware/util/CertificateManager.java

@@ -475,10 +475,15 @@ public class CertificateManager {
 
         // add subjectAlternativeName extension
         boolean critical = subjectDN.getRDNs().length == 0;
-        ASN1Sequence othernameSequence = new DERSequence(new ASN1Encodable[]{
-                new ASN1ObjectIdentifier("1.3.6.1.5.5.7.8.5"), new DERUTF8String( domain )});
-        GeneralName othernameGN = new GeneralName(GeneralName.otherName, othernameSequence);
-        GeneralNames subjectAltNames = new GeneralNames(new GeneralName[]{othernameGN});
+        ASN1Sequence othernameSequence = new DERSequence(
+            new ASN1Encodable[] {
+                new ASN1ObjectIdentifier("1.3.6.1.5.5.7.8.5"),
+                new DERTaggedObject( true, GeneralName.otherName, new DERUTF8String( domain ) )
+            }
+        );
+        DERTaggedObject othernameGN = new DERTaggedObject(false, GeneralName.otherName, othernameSequence);
+
+        GeneralNames subjectAltNames = GeneralNames.getInstance( new DERSequence( othernameGN ) );
         certBuilder.addExtension(Extension.subjectAlternativeName, critical, subjectAltNames);
 
         // add keyIdentifiers extensions