X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fkey.h;h=c1402c54e71f0e98f28030a3200c36697f8f01b3;hb=9d3e7f716accd67985f23048b4c36e7581348848;hp=9d16c8a15667a719df5e4f80b2eda059b6e62e5e;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git

diff --git a/src/key.h b/src/key.h
index 9d16c8a1..c1402c54 100644
--- a/src/key.h
+++ b/src/key.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/key.h
@@ -39,10 +53,10 @@ public:
 	Key ();
 
 	/** Create a Key from a raw key value */
-	Key (uint8_t const *);
+	explicit Key (uint8_t const *);
 
 	/** Create a Key from a hex key value */
-	Key (std::string);
+	explicit Key (std::string);
 
 	Key (Key const &);
 	~Key ();