Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-65701] use createElementNS in agile encyption writer code 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-11-24 17:00:08 +00:00
parent f661e7c5a0
commit 9cd858c393
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
View File

@ -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);

2
poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
View File

@ -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);
}

2
poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
View File

@ -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) {

2
poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
View File

@ -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);

15
poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
View File

@ -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.HashAlgorithm;
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);

BIN
poi/src/main/java9/module-info.class
View File

Binary file not shown.