Mercurial > hg > orthanc

changeset 65:e9e3c9e6a555 orthanc-renaming

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 16 Sep 2012 09:44:53 +0200
parents 71c4a4abe90b
children 5e195fdc22a3 9193041c8018
files Resources/CMake/OpenSslConfiguration.cmake Resources/Configuration.json
diffstat 2 files changed, 28 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/OpenSslConfiguration.cmake	Sun Sep 16 09:35:31 2012 +0200
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Sun Sep 16 09:44:53 2012 +0200
@@ -106,7 +106,6 @@
   endforeach()
 
   list(REMOVE_ITEM OPENSSL_SOURCES
-    ${OPENSSL_SOURCES_DIR}/crypto/LPdir_nyi.c
     ${OPENSSL_SOURCES_DIR}/crypto/LPdir_unix.c
     ${OPENSSL_SOURCES_DIR}/crypto/LPdir_vms.c
     ${OPENSSL_SOURCES_DIR}/crypto/LPdir_win.c
@@ -118,6 +117,7 @@
     ${OPENSSL_SOURCES_DIR}/crypto/bn/exp.c
     ${OPENSSL_SOURCES_DIR}/crypto/conf/cnf_save.c
     ${OPENSSL_SOURCES_DIR}/crypto/conf/test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/des/des.c
     ${OPENSSL_SOURCES_DIR}/crypto/des/des3s.cpp
     ${OPENSSL_SOURCES_DIR}/crypto/des/des_opts.c
     ${OPENSSL_SOURCES_DIR}/crypto/des/dess.cpp
@@ -135,8 +135,32 @@
     ${OPENSSL_SOURCES_DIR}/crypto/sparcv9cap.c
     ${OPENSSL_SOURCES_DIR}/crypto/x509v3/tabtest.c
     ${OPENSSL_SOURCES_DIR}/crypto/x509v3/v3conf.c
-    ${OPENSSL_SOURCES_DIR}/crypto/des/des.c
     ${OPENSSL_SOURCES_DIR}/ssl/ssl_task.c
+    ${OPENSSL_SOURCES_DIR}/crypto/LPdir_nyi.c
+    ${OPENSSL_SOURCES_DIR}/crypto/aes/aes_x86core.c
+    ${OPENSSL_SOURCES_DIR}/crypto/bio/bss_dgram.c
+    ${OPENSSL_SOURCES_DIR}/crypto/bn/bntest.c
+    ${OPENSSL_SOURCES_DIR}/crypto/bn/expspeed.c
+    ${OPENSSL_SOURCES_DIR}/crypto/bn/exptest.c
+    ${OPENSSL_SOURCES_DIR}/crypto/engine/enginetest.c
+    ${OPENSSL_SOURCES_DIR}/crypto/evp/evp_test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/hmac/hmactest.c
+    ${OPENSSL_SOURCES_DIR}/crypto/md5/md5.c
+    ${OPENSSL_SOURCES_DIR}/crypto/md5/md5test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/o_dir_test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/pkcs7/dec.c
+    ${OPENSSL_SOURCES_DIR}/crypto/pkcs7/enc.c
+    ${OPENSSL_SOURCES_DIR}/crypto/pkcs7/sign.c
+    ${OPENSSL_SOURCES_DIR}/crypto/pkcs7/verify.c
+    ${OPENSSL_SOURCES_DIR}/crypto/rsa/rsa_test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha1.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha1t.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha1test.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha256t.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/sha512t.c
+    ${OPENSSL_SOURCES_DIR}/crypto/sha/shatest.c
+    ${OPENSSL_SOURCES_DIR}/crypto/srp/srptest.c
     )
 
   #if (${MSVC})
--- a/Resources/Configuration.json	Sun Sep 16 09:35:31 2012 +0200
+++ b/Resources/Configuration.json	Sun Sep 16 09:44:53 2012 +0200
@@ -22,10 +22,10 @@
      **/
 
     // The DICOM Application Entity Title
-    "DicomAet" : "ANY-SCP",
+    "DicomAet" : "ORTHANC",
 
     // Check whether the called AET corresponds during a DICOM request
-    "DicomCheckCalledAet" : true,
+    "DicomCheckCalledAet" : false,
 
     // The DICOM port
     "DicomPort" : 4242,