Skip to content

(xmlsec-core) Mark read/write of private keys to XML as proprietary and deprecated #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lsh123 merged 1 commit into from
Sep 30, 2026
Merged

(xmlsec-core) Mark read/write of private keys to XML as proprietary and deprecated #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/xmlsec/strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAP[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAQ[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAG[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAJ[];
/* DSA X node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAX[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSAY[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeDSASeed[];
Expand Down Expand Up @@ -740,6 +742,8 @@ XMLSEC_EXPORT_VAR const xmlChar xmlSecHrefRSAKeyValue[];

XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRSAModulus[];
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRSAExponent[];
/* PrivateExponent node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
XMLSEC_EXPORT_VAR const xmlChar xmlSecNodeRSAPrivateExponent[];

XMLSEC_EXPORT_VAR const xmlChar xmlSecNameRsaMd5[];
Expand Down
22 changes: 15 additions & 7 deletions src/keysdata_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,7 +1924,9 @@ xmlSecKeyValueDsaXmlRead(xmlSecKeyValueDsaPtr data, xmlNodePtr node) {
}
cur = xmlSecGetNextElementNode(cur->next);

if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeDSAX, xmlSecDSigNs))) {
/* DSA X node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeDSAX, xmlSecNs))) {
/* next is X node. It is REQUIRED for private key but
* we are not sure exactly what we are reading */
ret = xmlSecBufferBase64NodeContentRead(&(data->x), cur);
Expand Down Expand Up @@ -2120,9 +2122,11 @@ xmlSecKeyValueDsaXmlWrite(xmlSecKeyValueDsaPtr data, xmlNodePtr node,
#endif /* LIBXML_VERSION >= 21300 */
}

/* next is X node: write it ONLY for private keys and ONLY if it is requested */
/* next is X node: write it ONLY for private keys and ONLY if it is requested.
* DSA X node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
if((writePrivateKey != 0) && (xmlSecBufferGetSize(&(data->x)) > 0)) {
cur = xmlSecAddChild(node, xmlSecNodeDSAX, xmlSecDSigNs);
cur = xmlSecAddChild(node, xmlSecNodeDSAX, xmlSecNs);
if(cur == NULL) {
xmlSecInternalError("xmlSecAddChild(NodeDSAX)", NULL);
return(-1);
Expand Down Expand Up @@ -2466,8 +2470,10 @@ xmlSecKeyValueRsaXmlRead(xmlSecKeyValueRsaPtr data, xmlNodePtr node) {
cur = xmlSecGetNextElementNode(cur->next);

/* next is PrivateExponent node. It is REQUIRED for private key but
* we are not sure exactly what we are reading */
if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeRSAPrivateExponent, xmlSecDSigNs))) {
* we are not sure exactly what we are reading.
* PrivateExponent node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
if((cur != NULL) && (xmlSecCheckNodeName(cur, xmlSecNodeRSAPrivateExponent, xmlSecNs))) {
ret = xmlSecBufferBase64NodeContentRead(&(data->privateExponent), cur);
if(ret < 0) {
xmlSecInternalError("xmlSecBufferBase64NodeContentRead(privateExponent)", NULL);
Expand Down Expand Up @@ -2589,9 +2595,11 @@ xmlSecKeyValueRsaXmlWrite(xmlSecKeyValueRsaPtr data, xmlNodePtr node,
#endif /* LIBXML_VERSION >= 21300 */
}

/* next is PrivateExponent node: write it ONLY for private keys and ONLY if it is requested */
/* next is PrivateExponent node: write it ONLY for private keys and ONLY if it is requested
* PrivateExponent node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
if((writePrivateKey != 0) && (xmlSecBufferGetSize(&(data->privateExponent)) > 0)) {
cur = xmlSecAddChild(node, xmlSecNodeRSAPrivateExponent, xmlSecDSigNs);
cur = xmlSecAddChild(node, xmlSecNodeRSAPrivateExponent, xmlSecNs);
if(cur == NULL) {
xmlSecInternalError("xmlSecAddChild(PrivateExponent)", NULL);
return(-1);
Expand Down
4 changes: 4 additions & 0 deletions src/strings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@ const xmlChar xmlSecNodeDSAP[] = "P";
const xmlChar xmlSecNodeDSAQ[] = "Q";
const xmlChar xmlSecNodeDSAG[] = "G";
const xmlChar xmlSecNodeDSAJ[] = "J";
/* DSA X node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
const xmlChar xmlSecNodeDSAX[] = "X";
const xmlChar xmlSecNodeDSAY[] = "Y";
const xmlChar xmlSecNodeDSASeed[] = "Seed";
Expand Down Expand Up @@ -707,6 +709,8 @@ const xmlChar xmlSecNodeRSAKeyValue[] = "RSAKeyValue";
const xmlChar xmlSecHrefRSAKeyValue[] = "http://www.w3.org/2000/09/xmldsig#RSAKeyValue";
const xmlChar xmlSecNodeRSAModulus[] = "Modulus";
const xmlChar xmlSecNodeRSAExponent[] = "Exponent";
/* PrivateExponent node is proprietary extension by XMLSec library and uses xmlSecNs namespace.
* DEPRECATED and will be removed in the future. */
const xmlChar xmlSecNodeRSAPrivateExponent[] = "PrivateExponent";

const xmlChar xmlSecNameRsaMd5[] = "rsa-md5";
Expand Down
2 changes: 1 addition & 1 deletion tests/keys/keys.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Rrg7e8pNLHMFK0pGW7xvzb7Kh6icJSsiBaX6aHqaQc9rSzzMJG3snBuQricNaUH5
8ipucT+hdPRTo6g0ty5noyyBmqUvYHf9NuskQhPDmC3uTtqQTHeCEuX8XoH3YYlB
uE4nXvQRGZoyy+43ISe9aDnEAgIUVQXEayTVppRF24I=
</G>
<X>
<X xmlns="http://www.aleksey.com/xmlsec/2002">
S3Gt9BE+wZb996U6h4nSNtYxEmE=
</X>
<Y>
Expand Down
Loading