/*
 * JBoss, Home of Professional Open Source.
 * Copyright 2016 Red Hat, Inc., and individual contributors
 * as indicated by the @author tags.
 *
 * 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.wildfly.security.x500.cert;

import org.wildfly.security.asn1.ASN1Encoder;
import org.wildfly.security.x500.X500;

/**
 * Subject key identifier extension as defined by <a href="https://tools.ietf.org/html/rfc5280#section-4.2.1.2">RFC 5280 § 4.2.1.2</a>.
 *
 * @author <a href="mailto:david.lloyd@redhat.com">David M. Lloyd</a>
 */
public final class SubjectKeyIdentifierExtension extends X509CertificateExtension {

    private final byte[] keyIdentifier;

    /**
     * Construct a new instance.
     *
     * @param keyIdentifier the key identifier to specify, or {@code null} to leave it out
     */
    public SubjectKeyIdentifierExtension(final byte[] keyIdentifier) {
        super(false);
        this.keyIdentifier = keyIdentifier;
    }

    public String getId() {
        return X500.OID_CE_SUBJECT_KEY_IDENTIFIER;
    }

    public void encodeTo(final ASN1Encoder encoder) {
        encoder.startSequence();
        if (keyIdentifier != null) {
            encoder.encodeImplicit(0);
            encoder.encodeOctetString(keyIdentifier);
        }
        encoder.endSequence();
    }
}

@@ -742,16 +742,50 @@
 .cert;%0A%0A
+import org.wildfly.common.Assert;%0A
 import o
@@ -906,19 +906,16 @@
 ion 
-as 
 defined 
 by %3C
@@ -910,18 +910,18 @@
 defined 
-by
+in
  %3Ca href
@@ -997,17 +997,131 @@
 .1.2%3C/a%3E
-.
+ as:%0A *%0A * %3Cpre%3E%0A *      SubjectKeyIdentifier ::= KeyIdentifier%0A *      KeyIdentifier ::= OCTET STRING%0A * %3C/pre%3E%0A *
 %0A *%0A * @
@@ -1425,41 +1425,35 @@
 cify
-, or %7B@code null%7D to leave it out
+ (must not be %7B@code null%7D)
 %0A   
@@ -1550,16 +1550,82 @@
 false);%0A
+        Assert.checkNotNullParam(%22keyIdentifier%22, keyIdentifier);%0A
         
@@ -1827,193 +1827,39 @@
 der.
-startSequence();%0A        if (keyIdentifier != null) %7B%0A            encoder.encodeImplicit(0);%0A            encoder.encodeOctetString(keyIdentifier);%0A        %7D%0A        encoder.endSequence(
+encodeOctetString(keyIdentifier
 );%0A 

Fix the DER encoding of the subject key identifier extension