Merge pull request #6 from DolbyLaboratories/dolby/atmos_storage/asdcplib_integration/compile_without_ssl

Fix compilation without OPENSSL

3 files changed, 11 insertions, 1 deletions

diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp
index 9cb4c15..878845d 100755
--- a/src/AS_DCP_MXF.cpp
+++ b/src/AS_DCP_MXF.cpp
@@ -466,6 +466,8 @@ ASDCP::RawEssenceType(const std::string& filename, EssenceType_t& type)
   return result;
 }
 
+#ifdef HAVE_OPENSSL
+
 //
 Result_t
 ASDCP::EncryptFrameBuffer(const ASDCP::FrameBuffer& FBin, ASDCP::FrameBuffer& FBout, AESEncContext* Ctx)
@@ -721,6 +723,8 @@ ASDCP::IntegrityPack::TestValues(const ASDCP::FrameBuffer& FB, const byte_t* Ass
   return result;
 }
 
+#endif //HAVE_OPENSSL
+
 //
 // end AS_DCP_MXF.cpp
 //
diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index ce2abf6..58677aa 100755
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -358,6 +358,7 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict,
 	  return RESULT_FORMAT;
 	}
 
+#ifdef HAVE_OPENSSL      
       if ( Ctx )
 	{
 	  // wrap the pointer and length as a FrameBuffer for use by
@@ -379,7 +380,8 @@ ASDCP::Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict,
 	    }
 	}
       else // return ciphertext to caller
-	{
+#endif //HAVE_OPENSSL	
+    {
 	  if ( FrameBuf.Capacity() < tmp_len )
 	    {
 	      char intbuf[IntBufferLen];
diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp
index b05749d..50a212c 100755
--- a/src/h__Writer.cpp
+++ b/src/h__Writer.cpp
@@ -402,6 +402,9 @@ ASDCP::Write_EKLV_Packet(Kumu::FileWriter& File, const ASDCP::Dictionary& Dict,
 
   if ( Info.EncryptedEssence )
     {
+    #ifndef HAVE_OPENSSL
+      return RESULT_CRYPT_CTX;
+    #else
       if ( ! Ctx )
 	return RESULT_CRYPT_CTX;
 
@@ -489,6 +492,7 @@ ASDCP::Write_EKLV_Packet(Kumu::FileWriter& File, const ASDCP::Dictionary& Dict,
 	  result = File.Writev(HMACOverhead.Data(), HMACOverhead.Length());
 	  StreamOffset += HMACOverhead.Length();
 	}
+#endif //HAVE_OPENSSL
     }
   else
     {