1 files changed, 49 insertions, 8 deletions

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
index e058c8a4b..718673a93 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureCreationInvoker.java
@@ -38,6 +38,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.security.Principal;
 import java.security.cert.X509Certificate;
@@ -51,8 +52,6 @@ import java.util.Set;
 
 import at.gv.egovernment.moa.logging.LogMsg;
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOAException;
 import at.gv.egovernment.moa.spss.MOASystemException;
@@ -238,12 +237,32 @@ public class CMSSignatureCreationInvoker {
 			  OutputStream  signedDataStream = signature.getSignature(out, base64);
 					 
 			  // now write the data to be signed to the signedDataStream
-			  byte[] buf = new byte[4096];
-			  int bytesRead;
-			  while ((bytesRead = contentIs.read(buf)) >= 0) {
-				  signedDataStream.write(buf, 0, bytesRead);
-			  } 
-					 
+			  
+			  int byteRead;
+			  BigDecimal counter = new BigDecimal("0");
+			  BigDecimal one = new BigDecimal("1");
+			  
+			  while ((byteRead=contentIs.read()) >= 0) {
+				  //System.out.println("counterXX: " + counter);
+				  
+				  if (inRange(counter, dataobject)) {
+					  //System.out.println("Lösche...");
+					  // set byte to 0x00
+					  signedDataStream.write(0);
+				  }
+				  else
+					  signedDataStream.write(byteRead);
+				  
+				  counter = counter.add(one);				  
+			  }
+			  
+			  
+//			  byte[] buf = new byte[4096];
+//			  int bytesRead;
+//			  while ((bytesRead = contentIs.read(buf)) >= 0) {
+//				  signedDataStream.write(buf, 0, bytesRead);
+//			  } 
+//					 
 			  // finish SignedData processing by closing signedDataStream
 			  signedDataStream.close();
 			  String base64value = out.toString();
@@ -269,6 +288,28 @@ public class CMSSignatureCreationInvoker {
 
     return responseBuilder.getResponse();
   }
+  
+  private boolean inRange(BigDecimal counter, CMSDataObject dataobject) {
+	  BigDecimal from = dataobject.getExcludeByteRangeFrom();
+	  BigDecimal to = dataobject.getExcludeByteRangeTo();
+	  
+	  if ( (from == null) || (to == null))
+		  return false;
+	  
+	  int compare = counter.compareTo(from);
+	  if (compare == -1)
+		  return false;
+	  else {
+		  compare = counter.compareTo(to);
+		  if (compare == 1)
+			  return false;
+		  else
+			  return true;
+	  }
+				  
+	  
+	  
+  }
 
   
   private String getDigestAlgorithm(ConfigurationProvider config, String keyGroupID) throws MOASystemException {