You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/11/24 17:00:08 UTC
svn commit: r1895303 - in /poi/trunk/poi/src/main: java/org/apache/poi/poifs/crypt/agile/ java9/
Author: fanningpj
Date: Wed Nov 24 17:00:08 2021
New Revision: 1895303
URL: http://svn.apache.org/viewvc?rev=1895303&view=rev
Log:
[bug-65701] use createElementNS in agile encyption writer code
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
poi/trunk/poi/src/main/java9/module-info.class
Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java Wed Nov 24 17:00:08 2021
@@ -17,13 +17,12 @@
package org.apache.poi.poifs.crypt.agile;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.getBinAttr;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.setBinAttr;
-
import org.apache.poi.EncryptedDocumentException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.*;
+
public class CertificateKeyEncryptor {
/**
@@ -60,9 +59,9 @@ public class CertificateKeyEncryptor {
void write(Element encryption) {
Document doc = encryption.getOwnerDocument();
- Element keyEncryptor = (Element) encryption.appendChild(doc.createElement("keyEncryptor"));
+ Element keyEncryptor = (Element) encryption.appendChild(doc.createElementNS(ENC_NS, "keyEncryptor"));
keyEncryptor.setAttribute("uri", KeyEncryptor.CERT_NS);
- Element encryptedKey = (Element) keyEncryptor.appendChild(doc.createElement("c:encryptedKey"));
+ Element encryptedKey = (Element) keyEncryptor.appendChild(doc.createElementNS(KeyEncryptor.CERT_NS, "c:encryptedKey"));
setBinAttr(encryptedKey, "encryptedKeyValue", encryptedKeyValue);
setBinAttr(encryptedKey, "x509Certificate", x509Certificate);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java Wed Nov 24 17:00:08 2021
@@ -59,7 +59,7 @@ public class DataIntegrity {
void write(Element encryption) {
Document doc = encryption.getOwnerDocument();
- Element dataIntegrity = (Element)encryption.appendChild(doc.createElement("dataIntegrity"));
+ Element dataIntegrity = (Element)encryption.appendChild(doc.createElementNS(ENC_NS, "dataIntegrity"));
setBinAttr(dataIntegrity, "encryptedHmacKey", encryptedHmacKey);
setBinAttr(dataIntegrity, "encryptedHmacValue", encryptedHmacValue);
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java Wed Nov 24 17:00:08 2021
@@ -76,7 +76,7 @@ public class EncryptionDocument {
if (dataIntegrity != null) {
dataIntegrity.write(encryption);
}
- Element keyEncryptors = (Element)encryption.appendChild(doc.createElement("keyEncryptors"));
+ Element keyEncryptors = (Element)encryption.appendChild(doc.createElementNS(ENC_NS, "keyEncryptors"));
boolean hasPass = false;
boolean hasCert = false;
for (KeyEncryptor ke : this.keyEncryptors) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java Wed Nov 24 17:00:08 2021
@@ -71,7 +71,7 @@ public class KeyData {
void write(Element encryption) {
Document doc = encryption.getOwnerDocument();
- Element keyData = (Element)encryption.appendChild(doc.createElement("keyData"));
+ Element keyData = (Element)encryption.appendChild(doc.createElementNS(ENC_NS, "keyData"));
setIntAttr(keyData, "saltSize", saltSize);
setIntAttr(keyData, "blockSize", blockSize);
setIntAttr(keyData, "keyBits", keyBits);
Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java Wed Nov 24 17:00:08 2021
@@ -17,12 +17,6 @@
package org.apache.poi.poifs.crypt.agile;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.getBinAttr;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.getIntAttr;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.setAttr;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.setBinAttr;
-import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.setIntAttr;
-
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.poifs.crypt.ChainingMode;
import org.apache.poi.poifs.crypt.CipherAlgorithm;
@@ -30,6 +24,9 @@ import org.apache.poi.poifs.crypt.HashAl
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import static org.apache.poi.poifs.crypt.agile.EncryptionDocument.*;
+import static org.apache.poi.poifs.crypt.agile.KeyEncryptor.PASS_NS;
+
public class PasswordKeyEncryptor {
/**
@@ -124,9 +121,9 @@ public class PasswordKeyEncryptor {
void write(Element encryption) {
Document doc = encryption.getOwnerDocument();
- Element keyEncryptor = (Element) encryption.appendChild(doc.createElement("keyEncryptor"));
- keyEncryptor.setAttribute("uri", KeyEncryptor.PASS_NS);
- Element encryptedKey = (Element) keyEncryptor.appendChild(doc.createElement("p:encryptedKey"));
+ Element keyEncryptor = (Element) encryption.appendChild(doc.createElementNS(ENC_NS, "keyEncryptor"));
+ keyEncryptor.setAttribute("uri", PASS_NS);
+ Element encryptedKey = (Element) keyEncryptor.appendChild(doc.createElementNS(PASS_NS, "p:encryptedKey"));
setIntAttr(encryptedKey, "saltSize", saltSize);
setIntAttr(encryptedKey, "blockSize", blockSize);
Modified: poi/trunk/poi/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java9/module-info.class?rev=1895303&r1=1895302&r2=1895303&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org