Fix incorrect free and leak.

[libdcp.git] / src / crypt_chain.cc

diff --git a/src/crypt_chain.cc b/src/crypt_chain.cc
index d07778599734ca82918601e4d92cea233f690fb9..41c7624bd5c12af9ac012ac8fbbcfe8aa7fddcd9 100644 (file)
--- a/src/crypt_chain.cc
+++ b/src/crypt_chain.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <fstream>
 #include <sstream>
 #include <boost/filesystem.hpp>
@@ -22,7 +41,7 @@ static void command (char const * c)
 }
 
 void
-libdcp::make_crypt_chain (string directory)
+libdcp::make_crypt_chain (boost::filesystem::path directory)
 {
        boost::filesystem::current_path (directory);
        command ("openssl genrsa -out ca.key 2048");
@@ -50,7 +69,8 @@ libdcp::make_crypt_chain (string directory)
        {
                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;
@@ -86,7 +106,7 @@ libdcp::make_crypt_chain (string directory)
        {
                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;
@@ -125,7 +145,7 @@ libdcp::make_crypt_chain (string directory)
        {
                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;