Fix fedora rawhide build.

xrootd · Jun 4, 2018 · fc8bf5d · fc8bf5d
1 parent 09fcf19
commit fc8bf5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/XrdCl/XrdClZipArchiveReader.cc b/src/XrdCl/XrdClZipArchiveReader.cc
@@ -831,7 +831,7 @@ DirectoryList* ZipArchiveReaderImpl::List()
   URL url( value );
 
   StatInfo *infoptr = 0;
-  pArchive.Stat( false, infoptr );
+  XRootDStatus st = pArchive.Stat( false, infoptr );
   std::unique_ptr<StatInfo> info( infoptr );
 
   DirectoryList *list = new DirectoryList();

diff --git a/src/XrdCrypto/XrdCryptosslX509.cc b/src/XrdCrypto/XrdCryptosslX509.cc
@@ -1126,7 +1126,11 @@ bool XrdCryptosslX509::MatchesSAN(const char *fqdn)
       int san_fqdn_len = ASN1_STRING_length(cstr);
       if (san_fqdn_len > 255)
          continue;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+      memcpy(san_fqdn, ASN1_STRING_get0_data(cstr), san_fqdn_len);
+#else
       memcpy(san_fqdn, ASN1_STRING_data(cstr), san_fqdn_len);
+#endif
       san_fqdn[san_fqdn_len] = '\0';
       if (strlen(san_fqdn) != static_cast<size_t>(san_fqdn_len)) // Avoid embedded null's.
          continue;