Encode correctly OCSP NONCE extension

WE2-819

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java

@@ -48,6 +48,7 @@
 import org.bouncycastle.cert.ocsp.OCSPReq;
 import org.bouncycastle.cert.ocsp.OCSPReqBuilder;
 
+import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.Objects;
 
@@ -82,19 +83,23 @@ public OCSPReq build() throws OCSPException {
         builder.addRequest(Objects.requireNonNull(certificateId, "certificateId"));
 
         if (ocspNonceEnabled) {
-            addNonce(builder);
+            try {
+                addNonce(builder);
+            } catch (IOException e) {
+                throw new OCSPException("Failed to generate OCSP NONCE extension", e);
+            }
         }
 
         return builder.build();
     }
 
-    private void addNonce(OCSPReqBuilder builder) {
+    private void addNonce(OCSPReqBuilder builder) throws IOException {
         final byte[] nonce = new byte[32];
         GENERATOR.nextBytes(nonce);
 
         final Extension[] extensions = new Extension[]{
             new Extension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false,
-                new DEROctetString(nonce))
+                new DEROctetString(new DEROctetString(nonce)))
         };
         builder.setRequestExtensions(new Extensions(extensions));
     }