projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e815a9
)
Add what I think is the correct escaping for backslashes in certificate subjects.
author
Carl Hetherington
<cth@carlh.net>
Mon, 8 Jul 2013 10:00:15 +0000
(11:00 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 8 Jul 2013 10:00:15 +0000
(11:00 +0100)
src/crypt_chain.cc
patch
|
blob
|
history
diff --git
a/src/crypt_chain.cc
b/src/crypt_chain.cc
index d07778599734ca82918601e4d92cea233f690fb9..edeec6d727ae6ff1ed556191f2c7267cd001c5a9 100644
(file)
--- a/
src/crypt_chain.cc
+++ b/
src/crypt_chain.cc
@@
-50,7
+50,8
@@
libdcp::make_crypt_chain (string directory)
{
ifstream f ("ca_dnq");
getline (f, ca_dnq);
{
ifstream f ("ca_dnq");
getline (f, ca_dnq);
- boost::replace_all (ca_dnq, "/", "\\/");
+ /* XXX: is this right? */
+ boost::replace_all (ca_dnq, "/", "\\\\/");
}
string const ca_subject = "/O=example.org/OU=example.org/CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION/dnQualifier=" + ca_dnq;
}
string const ca_subject = "/O=example.org/OU=example.org/CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION/dnQualifier=" + ca_dnq;
@@
-86,7
+87,7
@@
libdcp::make_crypt_chain (string directory)
{
ifstream f ("inter_dnq");
getline (f, inter_dnq);
{
ifstream f ("inter_dnq");
getline (f, inter_dnq);
- boost::replace_all (inter_dnq, "/", "\\/");
+ boost::replace_all (inter_dnq, "/", "\\
\\
/");
}
string const inter_subject = "/O=example.org/OU=example.org/CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION/dnQualifier=" + inter_dnq;
}
string const inter_subject = "/O=example.org/OU=example.org/CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION/dnQualifier=" + inter_dnq;
@@
-125,7
+126,7
@@
libdcp::make_crypt_chain (string directory)
{
ifstream f ("leaf_dnq");
getline (f, leaf_dnq);
{
ifstream f ("leaf_dnq");
getline (f, leaf_dnq);
- boost::replace_all (leaf_dnq, "/", "\\/");
+ boost::replace_all (leaf_dnq, "/", "\\
\\
/");
}
string const leaf_subject = "/O=example.org/OU=example.org/CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION/dnQualifier=" + leaf_dnq;
}
string const leaf_subject = "/O=example.org/OU=example.org/CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION/dnQualifier=" + leaf_dnq;